Merge branch 'master' into editorColors

.circleci/config.yml

@@ -72,6 +72,8 @@ jobs:
     parallelism: 12
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npx nx build remix-ide --with-deps
       - run:
@@ -105,6 +107,8 @@ jobs:
     parallelism: 12
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npm run downloadsolc_assets
       - run: npx nx build remix-ide --with-deps
@@ -139,6 +143,8 @@ jobs:
     parallelism: 12
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npx nx build remix-ide --with-deps
       - run:
@@ -172,6 +178,8 @@ jobs:
     parallelism: 12
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npm run downloadsolc_assets
       - run: npx nx build remix-ide --with-deps
@@ -206,6 +214,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npx nx build remix-ide --with-deps
       - run:
@@ -239,6 +249,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npx nx build remix-ide --with-deps
       - run: npx nx build remix-ide-e2e-src-local-plugin
@@ -254,6 +266,7 @@ jobs:
           path: ./reports/tests
       - store_artifacts:
           path: ./reports/screenshots
+
   deploy-remix-live:
     docker:
       # specify the version you desire here
@@ -272,6 +285,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npm run downloadsolc_assets
       - run: npm run build:production
@@ -300,6 +315,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - setup_remote_docker
       - run: npm install
       - run: npm run downloadsolc_assets
@@ -326,6 +343,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npm run downloadsolc_assets
       - run: npm run build:production
@@ -354,6 +373,8 @@ jobs:
 
     steps:
       - checkout
+      - run: git submodule sync --recursive
+      - run: git submodule update --recursive --init
       - run: npm install
       - run: npm run build:libs
       - run: npm run downloadsolc_assets

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "libs/remix-ui/tabs/react-tabs"]
+	path = libs/remix-ui/tabs/react-tabs
+	url = https://github.com/reactjs/react-tabs

apps/remix-ide-e2e/src/tests/remixd.test.ts

@@ -152,7 +152,6 @@ function runTests (browser: NightwatchBrowser) {
     })
     .clickLaunchIcon('filePanel')
     .waitForElementVisible('[data-path="folder1"]')
-    .click('[data-path="folder1"]')
     .waitForElementVisible('[data-path="folder1/contract1.sol"]')
     .waitForElementVisible('[data-path="folder1/renamed_contract_' + browserName + '.sol"]') // check if renamed file is preset
     .waitForElementNotPresent('[data-path="folder1/contract_' + browserName + '.sol"]') // check if renamed (old) file is not present

apps/remix-ide/.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": ["@babel/preset-env", "@babel/preset-react"]
+  "presets": ["@babel/preset-env", "@babel/preset-react"],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
 }

apps/remix-ide/src/app/panels/tab-proxy.js

@@ -229,19 +229,21 @@ export class TabProxy extends Plugin {
           })
           formatPath.shift()
           if (formatPath.length > 0) {
-            const duplicateTabName = this.loadedTabs.find(({ title }) => title === formatPath.join('/')).name
+            const index = this.loadedTabs.findIndex(({ title }) => title === formatPath.join('/'))
-            const duplicateTabPath = duplicateTabName.split('/')
+            if (index > -1) {
-            const duplicateTabFormatPath = [...duplicateTabPath].reverse()
+              const duplicateTabName = this.loadedTabs[index].name
-            const duplicateTabTitle = duplicateTabFormatPath.slice(0, titleLength).reverse().join('/')
+              const duplicateTabPath = duplicateTabName.split('/')
-
+              const duplicateTabFormatPath = [...duplicateTabPath].reverse()
-            this.loadedTabs.push({
+              const duplicateTabTitle = duplicateTabFormatPath.slice(0, titleLength).reverse().join('/')
-              id: duplicateTabName,
+              this.loadedTabs[index] = {
-              name: duplicateTabName,
+                id: duplicateTabName,
-              title: duplicateTabTitle,
+                name: duplicateTabName,
-              icon,
+                title: duplicateTabTitle,
-              tooltip: duplicateTabName,
+                icon,
-              iconClass: helper.getPathIcon(duplicateTabName)
+                tooltip: duplicateTabName,
-            })
+                iconClass: helper.getPathIcon(duplicateTabName)
+              }
+            }
           }
           break
         }
@@ -306,13 +308,8 @@ export class TabProxy extends Plugin {
   }
 
   renderTabsbar () {
-    window.React = React
-    const script = document.createElement('script')
-    script.type = 'text/javascript'
-    script.src = 'assets/js/react-tabs.production.min.js'
-    document.head.appendChild(script)
-    script.addEventListener('load', () => this.renderComponent())
     this.el = document.createElement('div')
+    this.renderComponent()
     return this.el
   }
 }

babel.config.js

@@ -1,4 +1,4 @@
 module.exports = {
     "presets": ["@babel/preset-react", "@babel/preset-typescript"],
-    "plugins": ["@babel/plugin-transform-modules-commonjs"]
+    "plugins": ["@babel/plugin-transform-modules-commonjs", "@babel/plugin-proposal-class-properties"]
 }

libs/remix-ui/tabs/.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]]
+  "presets": [["@nrwl/web/babel", { "useBuiltIns": "usage" }]],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
 }

libs/remix-ui/tabs/react-tabs

@@ -0,0 +1 @@
+Subproject commit 5a1fb0dc4b79f811e63e2f029786ff36b68bcbf4

libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line
-// import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'
+import { Tab, Tabs, TabList, TabPanel } from '../../react-tabs/src/index'
 import './remix-ui-tabs.css'
 
 /* eslint-disable-next-line */
@@ -17,10 +17,7 @@ export interface TabsUIApi {
     active: () => string
 }
 
-declare var ReactTabs: any
-
 export const TabsUI = (props: TabsUIProps) => {
-  const { Tab, Tabs, TabList, TabPanel } = ReactTabs
   const [selectedIndex, setSelectedIndex] = useState(-1)
   const currentIndexRef = useRef(-1)
   const tabsRef = useRef({})

libs/remix-ui/workspace/src/lib/reducers/workspace.ts

@@ -504,11 +504,11 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
         ...state,
         browser: {
           ...state.browser,
-          contextMenu: state.mode === 'browser' ? addContextMenuItem(state, payload) : state.browser.contextMenu
+          contextMenu: addContextMenuItem(state, payload)
         },
         localhost: {
           ...state.localhost,
-          contextMenu: state.mode === 'localhost' ? addContextMenuItem(state, payload) : state.localhost.contextMenu
+          contextMenu: addContextMenuItem(state, payload)
         }
       }
     }
@@ -520,11 +520,11 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
         ...state,
         browser: {
           ...state.browser,
-          contextMenu: state.mode === 'browser' ? removeContextMenuItem(state, payload) : state.browser.contextMenu
+          contextMenu: removeContextMenuItem(state, payload)
         },
         localhost: {
           ...state.localhost,
-          contextMenu: state.mode === 'localhost' ? removeContextMenuItem(state, payload) : state.localhost.contextMenu
+          contextMenu: removeContextMenuItem(state, payload)
         }
       }
     }
@@ -536,11 +536,11 @@ export const browserReducer = (state = browserInitialState, action: Action) => {
         ...state,
         browser: {
           ...state.browser,
-          expandPath: state.mode === 'browser' ? payload : state.browser.expandPath
+          expandPath: payload
         },
         localhost: {
           ...state.localhost,
-          expandPath: state.mode === 'localhost' ? payload : state.localhost.expandPath
+          expandPath: payload
         }
       }
     }

package.json

@@ -136,6 +136,7 @@
     ]
   },
   "dependencies": {
+    "@babel/plugin-proposal-class-properties": "^7.16.0",
     "@erebos/bzz-node": "^0.13.0",
     "@ethereumjs/block": "^3.5.1",
     "@ethereumjs/common": "^2.5.0",