mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

add review changes from rystew & LianaHus

Browse Source
pull/5370/head
Joseph Izang 3 years ago
parent 06c3037aad
commit e4651aaeeb
4 changed files with 107 additions and 83 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx
  2. 2
      libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css
  3. 170
      libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx
  4. 16
      libs/remix-ui/vertical-icons-panel/src/lib/vertical-icons-context-menu.tsx

2
libs/remix-ui/vertical-icons-panel/src/lib/components/Icon.tsx
Unescape View File

@ -68,7 +68,7 @@ function Icon ({
return ( return (
<Fragment> <Fragment>
<div <div
className="remixui_icon m-2" className="remixui_icon m-2 pl-1"
onLoad={() => { onLoad={() => {
if (name === 'filePanel') { if (name === 'filePanel') {
addActive(name) addActive(name)

2
libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.css
Unescape View File

@ -92,7 +92,7 @@
overflow-x: 'hidden'; overflow-x: 'hidden';
} }
.remixui_default-icons-container { .remixui_default-icons-container {
border-bottom: 1px solid #3f4455; border-bottom: 3px solid #3f4455;
} }
.remixui_icon-chevron { .remixui_icon-chevron {
z-index: 1000; z-index: 1000;

170
libs/remix-ui/vertical-icons-panel/src/lib/remix-ui-vertical-icons-panel.tsx
Unescape View File

@ -18,6 +18,11 @@ export interface RemixUiVerticalIconsPanelProps {
let scrollHeight: any let scrollHeight: any
let clientHeight: any let clientHeight: any
const requiredModules = [
'manager', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic']
const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider']
export function RemixUiVerticalIconsPanel ({ export function RemixUiVerticalIconsPanel ({
verticalIconsPlugin verticalIconsPlugin
@ -88,11 +93,18 @@ export function RemixUiVerticalIconsPanel ({
}, []) }, [])
useEffect(() => { useEffect(() => {
const themeModule = verticalIconsPlugin.registry.get('themeModule').api const found = iconPanelRef.current!.querySelector('#fileExplorerIcons')
themeModule.events.on('themeChanged', (theme: any) => { const localRead = localStorage.getItem('hadTour_initial') as string
onThemeChanged(theme.quality) const hadInitialTour = JSON.parse(localRead)
}) console.log('initial tour value ', hadInitialTour)
}, []) if (!found) console.log('VerticalIcon is not loaded yet!', found)
// return () => {
// if (!hadInitialTour) {
// if (found) console.log('Its event emission time!', found)
// }
// console.log('Won\'t be doing an initial tour of remix now!')
// }
})
return ( return (
<div id="iconsP" className="h-100"> <div id="iconsP" className="h-100">
@ -271,10 +283,50 @@ export function RemixUiVerticalIconsPanel ({
</div> </div>
)) ))
: null} : null}
{Object.keys(verticalIconsPlugin.targetProfileForChange)
.filter(p => p === 'pluginManager')
.map(p => (
<Icon
kind={
verticalIconsPlugin.targetProfileForChange[p].kind
}
displayName={
verticalIconsPlugin.targetProfileForChange[p]
.displayName
}
documentation={
verticalIconsPlugin.targetProfileForChange[p]
.documentation
}
icon={
verticalIconsPlugin.targetProfileForChange[p].icon
}
name={
verticalIconsPlugin.targetProfileForChange[p].name
}
tooltip={
verticalIconsPlugin.targetProfileForChange[p].tooltip
}
verticalIconPlugin={verticalIconsPlugin}
contextMenuAction={itemContextAction}
addActive={addActive}
removeActive={removeActive}
key={
verticalIconsPlugin.targetProfileForChange[p]
.displayName
}
/>
))}
</div> </div>
{scrollableRef.current && scrollableRef.current!.scrollHeight > scrollableRef.current!.clientHeight
? <i className="fa fa-chevron-up remixui_icon-chevron m-3"></i>
: null
}
<div <div
id="remixuiScrollable" id="remixuiScrollable"
className="remixui_scrollable-container remixui_scrollbar remixui_hide-scroll" className={scrollableRef.current && scrollableRef.current.clientHeight > 0
? 'border-bottom remixui_scrollable-container remixui_scrollbar remixui_hide-scroll'
: 'remixui_scrollable-container remixui_scrollbar remixui_hide-scroll'}
ref={scrollableRef} ref={scrollableRef}
> >
<OtherIcons> <OtherIcons>
@ -314,83 +366,47 @@ export function RemixUiVerticalIconsPanel ({
</OtherIcons> </OtherIcons>
</div> </div>
{scrollableRef.current && scrollableRef.current!.scrollHeight > scrollableRef.current!.clientHeight {scrollableRef.current && scrollableRef.current!.scrollHeight > scrollableRef.current!.clientHeight
? <i className="fa fa-chevron-double-down remixui_icon-chevron m-3"></i> ? <i className="fa fa-chevron-down remixui_icon-chevron m-3"></i>
: null : null
} }
{verticalIconsPlugin.targetProfileForChange && {verticalIconsPlugin.targetProfileForChange &&
Object.keys(verticalIconsPlugin.targetProfileForChange).length ? ( Object.keys(verticalIconsPlugin.targetProfileForChange).length ? (
<Fragment> <Fragment>
<Settings> <Settings>
<> {Object.keys(verticalIconsPlugin.targetProfileForChange)
{Object.keys(verticalIconsPlugin.targetProfileForChange) .filter(p => p === 'settings')
.filter(p => p === 'pluginManager') .map(p => (
.map(p => ( <Icon
<Icon kind={
kind={ verticalIconsPlugin.targetProfileForChange[p].kind
verticalIconsPlugin.targetProfileForChange[p].kind }
} displayName={
displayName={ verticalIconsPlugin.targetProfileForChange[p]
verticalIconsPlugin.targetProfileForChange[p] .displayName
.displayName }
} documentation={
documentation={ verticalIconsPlugin.targetProfileForChange[p]
verticalIconsPlugin.targetProfileForChange[p] .documentation
.documentation }
} icon={
icon={ verticalIconsPlugin.targetProfileForChange[p].icon
verticalIconsPlugin.targetProfileForChange[p].icon }
} name={
name={ verticalIconsPlugin.targetProfileForChange[p].name
verticalIconsPlugin.targetProfileForChange[p].name }
} tooltip={
tooltip={ verticalIconsPlugin.targetProfileForChange[p].tooltip
verticalIconsPlugin.targetProfileForChange[p].tooltip }
} verticalIconPlugin={verticalIconsPlugin}
verticalIconPlugin={verticalIconsPlugin} contextMenuAction={itemContextAction}
contextMenuAction={itemContextAction} addActive={addActive}
addActive={addActive} removeActive={removeActive}
removeActive={removeActive} key={
key={ verticalIconsPlugin.targetProfileForChange[p]
verticalIconsPlugin.targetProfileForChange[p] .displayName
.displayName }
} />
/> ))}
))}
{Object.keys(verticalIconsPlugin.targetProfileForChange)
.filter(p => p === 'settings')
.map(p => (
<Icon
kind={
verticalIconsPlugin.targetProfileForChange[p].kind
}
displayName={
verticalIconsPlugin.targetProfileForChange[p]
.displayName
}
documentation={
verticalIconsPlugin.targetProfileForChange[p]
.documentation
}
icon={
verticalIconsPlugin.targetProfileForChange[p].icon
}
name={
verticalIconsPlugin.targetProfileForChange[p].name
}
tooltip={
verticalIconsPlugin.targetProfileForChange[p].tooltip
}
verticalIconPlugin={verticalIconsPlugin}
contextMenuAction={itemContextAction}
addActive={addActive}
removeActive={removeActive}
key={
verticalIconsPlugin.targetProfileForChange[p]
.displayName
}
/>
))}
</>
</Settings> </Settings>
</Fragment> </Fragment>
) : null} ) : null}

16
libs/remix-ui/vertical-icons-panel/src/lib/vertical-icons-context-menu.tsx
Unescape View File

@ -34,6 +34,12 @@ interface MenuProps {
hide: () => void hide: () => void
} }
const requiredModules = [
'manager', 'compilerArtefacts', 'compilerMetadata', 'contextualListener', 'editor', 'offsetToLineColumnConverter', 'network', 'theme',
'fileManager', 'contentImport', 'blockchain', 'web3Provider', 'scriptRunner', 'fetchAndCompile', 'mainPanel', 'hiddenPanel', 'sidePanel', 'menuicons',
'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic']
const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider']
function VerticalIconsContextMenu (props: VerticalIconsContextMenuProps) { function VerticalIconsContextMenu (props: VerticalIconsContextMenuProps) {
const menuRef = useRef(null) const menuRef = useRef(null)
useEffect(() => { useEffect(() => {
@ -81,8 +87,8 @@ function MenuForLinks ({
}: MenuLinksProps) { }: MenuLinksProps) {
return ( return (
<Fragment> <Fragment>
{listItems.CanDeactivate && {listItems.CanDeactivate && !requiredModules.includes(profileName)
<li ? <li
id="menuitemdeactivate" id="menuitemdeactivate"
onClick={(evt) => { onClick={(evt) => {
contextMenuAction(evt, profileName, listItems.Documentation) contextMenuAction(evt, profileName, listItems.Documentation)
@ -90,8 +96,10 @@ function MenuForLinks ({
}} }}
className="remixui_liitem" className="remixui_liitem"
> >
Deactivate Deactivate
</li>} </li>
: null
}
{(listItems.Documentation && listItems.Documentation.length > 0) && {(listItems.Documentation && listItems.Documentation.length > 0) &&
<li <li
id="menuitemdocumentation" id="menuitemdocumentation"

Write Preview
Loading…
Cancel
Save