merging

apps/remix-ide/src/app.js

@@ -322,7 +322,7 @@ class AppComponent {
     } catch (e) {
       console.log("couldn't register iframe plugins", e.message)
     }
-    await self.appManager.activatePlugin(['modal'])
+    await self.appManager.activatePlugin(['layout'])
     await self.appManager.activatePlugin(['modal'])
     await self.appManager.activatePlugin(['editor'])
     await self.appManager.activatePlugin(['theme', 'fileManager', 'compilerMetadata', 'compilerArtefacts', 'network', 'web3Provider', 'offsetToLineColumnConverter'])

apps/remix-ide/src/remixAppManager.js

@@ -9,12 +9,12 @@ const _paq = window._paq = window._paq || []
 const requiredModules = [ // services + layout views + system views
   'manager', 'config', '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', 'walkthrough', 'layout']
+  'filePanel', 'terminal', 'settings', 'pluginManager', 'tabs', 'udapp', 'dGitProvider', 'solidity-logic', 'walkthrough', 'layout', 'modal']
 
 const dependentModules = ['git', 'hardhat', 'slither'] // module which shouldn't be manually activated (e.g git is activated by remixd)
 
 export function isNative (name) {
-  const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider', 'solidityStaticAnalysis', 'solidityUnitTesting', 'layout']
+  const nativePlugins = ['vyper', 'workshops', 'debugger', 'remixd', 'menuicons', 'solidity', 'hardhat-provider', 'solidityStaticAnalysis', 'solidityUnitTesting', 'layout', 'modal']
   return nativePlugins.includes(name) || requiredModules.includes(name)
 }
 

libs/remix-ui/app/src/lib/remix-app/components/modals/dialogViewPlugin.tsx

@@ -7,7 +7,6 @@ const DialogViewPlugin = () => {
   const app = useContext(AppContext)
 
   useEffect(() => {
-    console.log(modal, app)
     app.modal.setDispatcher({ modal, alert, toast })
   }, [])
   return <></>

libs/remix-ui/app/src/lib/remix-app/context/context.tsx

@@ -3,7 +3,7 @@ import { AlertModal, AppModal } from '../interface'
 import { ModalInitialState } from '../state/modals'
 import { ModalTypes } from '../types'
 
-const AppContext = React.createContext<{layout: any, settings: any, showMatamo: boolean, appManager: any, modal: any}>(null)
+export const AppContext = React.createContext<any>(null)
 
 export interface dispatchModalInterface {
   modal: (data: AppModal) => void

libs/remix-ui/panel/src/lib/main/main-panel.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable no-unused-expressions */
-import AppContext from 'libs/remix-ui/app/src/lib/remix-app/context/context'
+import { AppContext } from 'libs/remix-ui/app/src/lib/remix-app/context/context'
 import React, { useContext, useEffect, useLayoutEffect, useRef, useState } from 'react' // eslint-disable-line
 import DragBar from '../dragbar/dragbar'
 import RemixUIPanelPlugin from '../plugins/panel-plugin'