From 46a082a8159944792c751bd038eb6ecfe0c179fd Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 12 Sep 2022 12:52:08 +0200 Subject: [PATCH 1/6] play btn to run scripts --- apps/remix-ide/src/app/editor/editor.js | 43 +++++++----------- apps/remix-ide/src/remixAppManager.js | 3 +- .../remix-app/components/dragbar/dragbar.tsx | 1 + .../panel/src/lib/dragbar/dragbar.tsx | 1 + .../src/lib/compiler-container.tsx | 10 ++++- libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx | 45 ++++++++++++++----- 6 files changed, 63 insertions(+), 40 deletions(-) diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js index 10dab21ecc..7a6518081f 100644 --- a/apps/remix-ide/src/app/editor/editor.js +++ b/apps/remix-ide/src/app/editor/editor.js @@ -5,6 +5,7 @@ import { EditorUI } from '@remix-ui/editor' // eslint-disable-line import { Plugin } from '@remixproject/engine' import * as packageJson from '../../../../../package.json' import { PluginViewWrapper } from '@remix-ui/helper' +import { exists } from 'fs' const EventManager = require('../../lib/events') @@ -74,30 +75,15 @@ class Editor extends Plugin { updateComponent(state) { return + editorAPI={state.api} + themeType={state.currentThemeType} + currentFile={state.currentFile} + events={state.events} + plugin={state.plugin} + /> } render () { - -/* if (this.el) return this.el - - this.el = document.createElement('div') - this.el.setAttribute('id', 'editorView') - this.el.currentContent = () => this.currentContent() // used by e2e test - this.el.setCurrentContent = (value) => { - if (this.sessions[this.currentFile]) { - this.sessions[this.currentFile].setValue(value) - this._onChange(this.currentFile) - } - } - this.el.gotoLine = (line, column) => this.gotoLine(line, column || 0) - this.el.getCursorPosition = () => this.getCursorPosition() */ - return
{ this.ref = element this.ref.currentContent = () => this.currentContent() // used by e2e test @@ -113,7 +99,7 @@ class Editor extends Plugin { this.ref.clearDecorationsByPlugin = (filePath, plugin, typeOfDecoration) => this.clearDecorationsByPlugin(filePath, plugin, typeOfDecoration) this.ref.keepDecorationsFor = (name, typeOfDecoration) => this.keepDecorationsFor(name, typeOfDecoration) }} id='editorView'> - +
} @@ -229,15 +215,20 @@ class Editor extends Plugin { try { // we can't use the fileManager plugin call directly // because it's itself called in a plugin context, and that causes a timeout in the plugin stack - const contentDep = await readFile(pathDep) - if (contentDep !== null) { - this.emit('addModel', contentDep, 'typescript', pathDep, false) + const pathExists = await exists(pathDep) + let contentDep = '' + if (pathExists) { + contentDep = await readFile(pathDep) + if (contentDep !== '') { + this.emit('addModel', contentDep, 'typescript', pathDep, false) + } + } else { + console.log("The file ", pathDep, " can't be found.") } } catch (e) { console.log(e) } } - } } diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index 3f02d4e716..0f97707ce6 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -25,7 +25,8 @@ const sensitiveCalls = { export function isNative(name) { // nativePlugin allows to bypass the permission request const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'solidity-logic', 'solidityStaticAnalysis', 'solidityUnitTesting', - 'layout', 'notification', 'hardhat-provider', 'ganache-provider', 'foundry-provider', 'basic-http-provider', 'injected-optimism-provider', 'injected-arbitrum-one-provider'] + 'layout', 'notification', 'hardhat-provider', 'ganache-provider', 'foundry-provider', 'basic-http-provider', 'injected-optimism-provider', + 'tabs', 'injected-arbitrum-one-provider'] return nativePlugins.includes(name) || requiredModules.includes(name) } diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx index b35097adc0..18aae23ed8 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx @@ -45,6 +45,7 @@ const DragBar = (props: IRemixDragBarUi) => { }, [props.resetTrigger]) const handleResize = () => { + if (!props.refObject.current) return setOffSet(props.refObject.current.offsetLeft) setDragBarPosX(props.refObject.current.offsetLeft + props.refObject.current.offsetWidth) } diff --git a/libs/remix-ui/panel/src/lib/dragbar/dragbar.tsx b/libs/remix-ui/panel/src/lib/dragbar/dragbar.tsx index 116630c64c..642786e866 100644 --- a/libs/remix-ui/panel/src/lib/dragbar/dragbar.tsx +++ b/libs/remix-ui/panel/src/lib/dragbar/dragbar.tsx @@ -23,6 +23,7 @@ const DragBar = (props: IRemixDragBarUi) => { props.setHideStatus(false) } const handleResize = () => { + if (!props.refObject.current) return setDragBarPosY(window.innerHeight - props.refObject.current.offsetHeight) } diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index 857a86e73c..0af0ceecd5 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -863,7 +863,13 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
- diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 67c7224c96..817316a520 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -1,8 +1,8 @@ import { fileDecoration, FileDecorationIcons } from '@remix-ui/file-decorators' import { Plugin } from '@remixproject/engine' - import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint-disable-line +import { OverlayTrigger, Tooltip } from 'react-bootstrap' // eslint-disable-line import { Tab, Tabs, TabList, TabPanel } from 'react-tabs' import './remix-ui-tabs.css' @@ -17,23 +17,19 @@ export interface TabsUIProps { onReady: (api: any) => void themeQuality: string } - export interface TabsUIApi { - activateTab: (namee: string) => void + activateTab: (name: string) => void active: () => string } - interface ITabsState { selectedIndex: number, fileDecorations: fileDecoration[], } - interface ITabsAction { type: string, payload: any, } - const initialTabsState: ITabsState = { selectedIndex: -1, fileDecorations: [], @@ -58,6 +54,7 @@ const tabsReducer = (state: ITabsState, action: ITabsAction) => { export const TabsUI = (props: TabsUIProps) => { const [tabsState, dispatch] = useReducer(tabsReducer, initialTabsState); + const [currentFileExt, setCurrentFileExt] = useState('sol') const currentIndexRef = useRef(-1) const tabsRef = useRef({}) const tabsElement = useRef(null) @@ -71,8 +68,6 @@ export const TabsUI = (props: TabsUIProps) => { } }, [tabsState.selectedIndex]) - - const getFileDecorationClasses = (tab: any) => { const fileDecoration = tabsState.fileDecorations.find((fileDecoration: fileDecoration) => { if(`${fileDecoration.workspace.name}/${fileDecoration.path}` === tab.name) return true @@ -84,8 +79,7 @@ export const TabsUI = (props: TabsUIProps) => { return } - - const renderTab = (tab, index) => { + const renderTab = (tab, index) => { const classNameImg = 'my-1 mr-1 text-dark ' + tab.iconClass const classNameTab = 'nav-item nav-link d-flex justify-content-center align-items-center px-2 py-1 tab' + (index === currentIndexRef.current ? ' active' : '') const invert = props.themeQuality === 'dark' ? 'invert(1)' : 'invert(0)' @@ -106,9 +100,12 @@ export const TabsUI = (props: TabsUIProps) => { if (currentIndexRef.current < 0) return '' return tabs.current[currentIndexRef.current].name } + const activateTab = (name: string) => { const index = tabs.current.findIndex((tab) => tab.name === name) currentIndexRef.current = index + const ext = getExt(name) + setCurrentFileExt(ext) dispatch({ type: 'SELECT_INDEX', payload: index }) } @@ -135,10 +132,36 @@ export const TabsUI = (props: TabsUIProps) => { return () => { tabsElement.current.removeEventListener('wheel', transformScroll) } }, []) + const getExt = (path) => { + const root = path.split('#')[0].split('?')[0] + const ext = root.indexOf('.') !== -1 ? /[^.]+$/.exec(root) : null + if (ext) return ext[0] + else return'txt' + } + return (
-
+
+ + + Run script + + + }> + + props.onZoomOut()}> props.onZoomIn()}>
From 127fef4377e7d32a68c2801a8854728efbe2dd52 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 12 Sep 2022 14:27:31 +0200 Subject: [PATCH 2/6] improving tooltip --- libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx | 49 ++++++++++---------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 817316a520..340bab9a0c 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -24,15 +24,18 @@ export interface TabsUIApi { interface ITabsState { selectedIndex: number, fileDecorations: fileDecoration[], + currentExt: string } interface ITabsAction { type: string, payload: any, + ext?: string, } const initialTabsState: ITabsState = { selectedIndex: -1, fileDecorations: [], + currentExt: '' } const tabsReducer = (state: ITabsState, action: ITabsAction) => { @@ -40,6 +43,7 @@ const tabsReducer = (state: ITabsState, action: ITabsAction) => { case 'SELECT_INDEX': return { ...state, + currentExt: action.ext, selectedIndex: action.payload, } case 'SET_FILE_DECORATIONS': @@ -54,7 +58,6 @@ const tabsReducer = (state: ITabsState, action: ITabsAction) => { export const TabsUI = (props: TabsUIProps) => { const [tabsState, dispatch] = useReducer(tabsReducer, initialTabsState); - const [currentFileExt, setCurrentFileExt] = useState('sol') const currentIndexRef = useRef(-1) const tabsRef = useRef({}) const tabsElement = useRef(null) @@ -104,9 +107,7 @@ export const TabsUI = (props: TabsUIProps) => { const activateTab = (name: string) => { const index = tabs.current.findIndex((tab) => tab.name === name) currentIndexRef.current = index - const ext = getExt(name) - setCurrentFileExt(ext) - dispatch({ type: 'SELECT_INDEX', payload: index }) + dispatch({ type: 'SELECT_INDEX', payload: index, ext: getExt(name)}) } const setFileDecorations = (fileStates: fileDecoration[]) => { @@ -136,32 +137,32 @@ export const TabsUI = (props: TabsUIProps) => { const root = path.split('#')[0].split('?')[0] const ext = root.indexOf('.') !== -1 ? /[^.]+$/.exec(root) : null if (ext) return ext[0] - else return'txt' + else return '' } return (
- - - Run script - - - }> - - + + props.onZoomOut()}> props.onZoomIn()}>
@@ -176,7 +177,7 @@ export const TabsUI = (props: TabsUIProps) => { onSelect={(index) => { props.onSelect(index) currentIndexRef.current = index - dispatch({ type: 'SELECT_INDEX', payload: index }) + dispatch({ type: 'SELECT_INDEX', payload: index, ext: getExt(props.tabs[currentIndexRef.current].name)}) }} > From c806eb7d456321ae026ba9f4540ffa33af88404b Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 12 Sep 2022 17:11:17 +0200 Subject: [PATCH 3/6] compile for .sol files --- libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index 340bab9a0c..d5028dd176 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -146,17 +146,22 @@ export const TabsUI = (props: TabsUIProps) => {