From 5a3e766e665dc9690be47895fcea1086982a3f4b Mon Sep 17 00:00:00 2001 From: lianahus Date: Tue, 18 Jan 2022 16:11:58 +0100 Subject: [PATCH] fixed conflict solveing related issue --- .../home-tab/src/lib/remix-ui-home-tab.tsx | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx index 83f42fce19..73bd4f0357 100644 --- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx +++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx @@ -126,6 +126,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => { } const createNewFile = async () => { + plugin.verticalIcons.select('filePanel') await plugin.call('filePanel', 'createNewFile') } @@ -262,21 +263,22 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {

File

- createNewFile()}>New File +

- + + + { + event.stopPropagation() + plugin.verticalIcons.select('filePanel') + uploadFile(event.target) + }} multiple />

- connectToLocalhost()}>Connect to Localhost +

@@ -302,7 +304,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {

- switchToPreviousVersion()}>Old experience +