Merge branch 'master' into fix-recorder

3 years ago · 02982cab6c
parent ba6c07a4e6 478f7fd4a2
commit 02982cab6c
5 changed files with 25 additions and 86 deletions
--- a/apps/remix-ide/src/app/tabs/theme-module.js
+++ b/apps/remix-ide/src/app/tabs/theme-module.js
@ -35,15 +35,17 @@ export class ThemeModule extends Plugin {
    }
    this.themes = themes.reduce((acc, theme) => {
      theme.url = window.location.origin + window.location.pathname + theme.url
-      return { ...acc, [theme.name]: theme }
+      return { ...acc, [theme.name.toLocaleLowerCase()]: theme }
    }, {})
    this._paq = _paq
    let queryTheme = (new QueryParams()).get().theme
+    queryTheme = queryTheme && queryTheme.toLocaleLowerCase()
    queryTheme = this.themes[queryTheme] ? queryTheme : null
    let currentTheme = this._deps.config.get('settings/theme')
+    currentTheme = currentTheme && currentTheme.toLocaleLowerCase()
    currentTheme = this.themes[currentTheme] ? currentTheme : null
    this.currentThemeState = { queryTheme, currentTheme }
-    this.active = queryTheme || currentTheme || 'Dark'
+    this.active = queryTheme || currentTheme || 'dark'
    this.forced = !!queryTheme
  }

@ -82,6 +84,7 @@ export class ThemeModule extends Plugin {
   * @param {string} [themeName] - The name of the theme
   */
  switchTheme (themeName) {
+    themeName = themeName && themeName.toLocaleLowerCase() 
    if (themeName && !Object.keys(this.themes).includes(themeName)) {
      throw new Error(`Theme ${themeName} doesn't exist`)
    }
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.css
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.css
@ -10,6 +10,11 @@
    width: auto;
 }

+.monaco-hover .markdown-hover > .hover-contents:not(.code-hover-contents) {
+    max-width: none !important;
+    word-wrap: break-word;
+}
+
 .contextview {
    opacity: 1;
    position: absolute;
--- a/libs/remix-ui/permission-handler/src/lib/permission-dialog.tsx
+++ b/libs/remix-ui/permission-handler/src/lib/permission-dialog.tsx
@ -56,7 +56,7 @@ const PermissionHandlerDialog = (props: PermissionHandlerProps) => {
    <article className='remember'>
      <div className='form-check'>
        {rememberSwitch()}
-        <label className="form-check-label" data-id="permissionHandlerRememberChoice">Remember this choice</label>
+        <label htmlFor='remember' className="form-check-label" data-id="permissionHandlerRememberChoice">Remember this choice</label>
      </div>
      <button className="btn btn-sm" onClick={reset}>Reset all Permissions</button>
    </article>
--- a/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
+++ b/libs/remix-ui/solidity-unit-testing/src/lib/solidity-unit-testing.tsx
@ -67,6 +67,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
  let [readyTestsNumber, setReadyTestsNumber] = useState<number>(0) // eslint-disable-line
  let [runningTestsNumber, setRunningTestsNumber] = useState<number>(0) // eslint-disable-line

+  const areTestsRunning = useRef<boolean>(false)
  const hasBeenStopped = useRef<boolean>(false)
  const isDebugging = useRef<boolean>(false)
  const allTests = useRef<string[]>([])
@ -74,7 +75,6 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
  const currentErrors:any = useRef([]) // eslint-disable-line @typescript-eslint/no-explicit-any

  const defaultPath = 'tests'
-  let areTestsRunning = false

  let runningTestFileName: string
  const filesContent: Record<string, Record<string, string>> = {}
@ -113,7 +113,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
      allTests.current = tests
      selectedTests.current = [...allTests.current]
      updateTestFileList()
-      if (!areTestsRunning) await updateRunAction(file)
+      if (!areTestsRunning.current) await updateRunAction(file)
    } catch (e: any) { // eslint-disable-line @typescript-eslint/no-explicit-any
      console.log(e)
      setToasterMsg(e)
@ -153,7 +153,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
      await setCurrentPath(defaultPath)
    })

-    testTab.fileManager.events.on('noFileSelected', () => { }) // eslint-disable-line
+    testTab.fileManager.events.on('noFileSelected', async () => { await updateForNewCurrent() })
    testTab.fileManager.events.on('currentFileChanged', async (file: string) => await updateForNewCurrent(file))

  }, []) // eslint-disable-line
@ -167,15 +167,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
  const handleTestDirInput = async (e: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
    let testDirInput = trimTestDirInput(e.target.value)
    testDirInput = helper.removeMultipleSlashes(testDirInput)
-    if (testDirInput !== '/') testDirInput = helper.removeTrailingSlashes(testDirInput)
    setInputPathValue(testDirInput)
-    if (e.key === 'Enter') {
-      if (await testTabLogic.pathExists(testDirInput)) {
-        testTabLogic.setCurrentPath(testDirInput)
-        await updateForNewCurrent()
-        return
-      }
-    }
    if (testDirInput) {
      if (testDirInput.endsWith('/') && testDirInput !== '/') {
        testDirInput = helper.removeTrailingSlashes(testDirInput)
@ -205,17 +197,6 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
    }
  }

-  const handleEnter = async (e: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
-    let inputPath = e.target.value
-    inputPath = helper.removeMultipleSlashes(trimTestDirInput(inputPath))
-    setInputPathValue(inputPath)
-    if (disableCreateButton) {
-      if (await testTabLogic.pathExists(inputPath)) {
-        await setCurrentPath(inputPath)
-      }
-    }
-  }
-
  const handleCreateFolder = async () => {
    let inputPath = trimTestDirInput(inputPathValue)
    let path = helper.removeMultipleSlashes(inputPath)
@ -519,7 +500,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
      if (selectedTests.current?.length !== 0) {
        setDisableRunButton(false)
      }
-      areTestsRunning = false
+      areTestsRunning.current = false
    }
  }

@ -566,7 +547,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
  }

  const runTests = () => {
-    areTestsRunning = true
+    areTestsRunning.current = true
    hasBeenStopped.current = false
    readyTestsNumber = 0
    setReadyTestsNumber(readyTestsNumber)
@ -587,14 +568,14 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d

  const updateRunAction = async (currentFile: any = null) => { // eslint-disable-line @typescript-eslint/no-explicit-any
    const isSolidityActive = await testTab.appManager.isActive('solidity')
-    if (!isSolidityActive || !selectedTests.current?.length) {
-      // setDisableRunButton(true)
+    if (!isSolidityActive || !selectedTests.current.length) {
+      setDisableRunButton(true)
      if (!currentFile || (currentFile && currentFile.split('.').pop().toLowerCase() !== 'sol')) {
        setRunButtonTitle('No solidity file selected')
      } else {
        setRunButtonTitle('The "Solidity Plugin" should be activated')
      }
-    }
+    } else setDisableRunButton(false)
  }

  const stopTests = () => {
@ -611,7 +592,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d

  const toggleCheckbox = (eChecked: boolean, index: number) => {
    testFiles[index].checked = eChecked
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
    selectedTests.current = getCurrentSelectedTests()
    if (eChecked) {
      setCheckSelectAll(true)
@ -628,7 +609,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d

  const checkAll = (event: any) => { // eslint-disable-line @typescript-eslint/no-explicit-any
    testFiles.forEach((testFileObj) => testFileObj.checked = event.target.checked)
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
    setCheckSelectAll(event.target.checked)
    if (event.target.checked) {
      selectedTests.current = getCurrentSelectedTests()
@ -646,7 +627,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
    }
    else
      testFiles = []
-    setTestFiles(testFiles)
+    setTestFiles([...testFiles])
  }

  return (
@ -674,8 +655,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
              title="Press 'Enter' to change the path for test files."
              style={{ backgroundImage: "var(--primary)" }}
              onKeyDown={() => { if (inputPathValue === '/') setInputPathValue('')} }
-              onKeyUp={handleTestDirInput}
-              onChange={handleEnter}
+              onChange={handleTestDirInput}
              onClick = {() => { if (inputPathValue === '/') setInputPathValue('')} }
            />
            <button
@ -728,7 +708,7 @@ export const SolidityUnitTesting = (props: Record<string, any>) => { // eslint-d
          />
          <label className="text-nowrap pl-2 mb-0" htmlFor="checkAllTests"> Select all </label>
        </div>
-        <div className="testList py-2 mt-0 border-bottom">{testFiles?.length ? testFiles.map((testFileObj: TestObject, index) => {
+        <div className="testList py-2 mt-0 border-bottom">{testFiles.length ? testFiles.map((testFileObj: TestObject, index) => {
          const elemId = `singleTest${testFileObj.fileName}`
          return (
            <div className="d-flex align-items-center py-1" key={index}>
--- a/libs/remix-ui/theme-module/src/lib/remix-ui-theme-module.tsx
+++ b/libs/remix-ui/theme-module/src/lib/remix-ui-theme-module.tsx
@ -8,55 +8,6 @@ export interface RemixUiThemeModuleProps {
  themeModule: ThemeModule;
 }

-const defaultThemes = [
-  {
-    name: 'Dark',
-    quality: 'dark',
-    url: 'assets/css/themes/remix-dark_tvx1s2.css'
-  },
-  {
-    name: 'Light',
-    quality: 'light',
-    url: 'assets/css/themes/remix-light_powaqg.css'
-  },
-  {
-    name: 'Midcentury',
-    quality: 'light',
-    url: 'assets/css/themes/remix-midcentury_hrzph3.css'
-  },
-  {
-    name: 'Black',
-    quality: 'dark',
-    url: 'assets/css/themes/remix-black_undtds.css'
-  },
-  {
-    name: 'Candy',
-    quality: 'light',
-    url: 'assets/css/themes/remix-candy_ikhg4m.css'
-  },
-
-  {
-    name: 'Cerulean',
-    quality: 'light',
-    url: 'assets/css/themes/bootstrap-cerulean.min.css'
-  },
-  {
-    name: 'Flatly',
-    quality: 'light',
-    url: 'assets/css/themes/bootstrap-flatly.min.css'
-  },
-  {
-    name: 'Spacelab',
-    quality: 'light',
-    url: 'assets/css/themes/bootstrap-spacelab.min.css'
-  },
-  {
-    name: 'Cyborg',
-    quality: 'dark',
-    url: 'assets/css/themes/bootstrap-cyborg.min.css'
-  }
-];
-
 export function RemixUiThemeModule({ themeModule }: RemixUiThemeModuleProps) {
  const [themeName, setThemeName] = useState('')

@ -85,7 +36,7 @@ export function RemixUiThemeModule({ themeModule }: RemixUiThemeModuleProps) {
                    name="theme"
                    id={theme.name}
                    data-id={`settingsTabTheme${theme.name}`}
-                    checked={themeModule.active === theme.name}
+                    checked={themeModule.active === theme.name.toLocaleLowerCase()}
                  />
                  <label
                    className="form-check-label custom-control-label"