@teambit/scope 1.0.420 → 1.0.421

package/dist/{preview-1727810275935.js → preview-1727839291394.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.scope_scope@1.0.420/dist/scope.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.scope_scope@1.0.420/dist/scope.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.scope_scope@1.0.421/dist/scope.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad/teambit.scope_scope@1.0.421/dist/scope.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/scope.ui.drawer.js

@@ -61,15 +61,7 @@ const scopeDrawer = ({
   const customScopeTreeNodeRenderer = (treeNodeSlot, host) => function TreeNode(props) {
     const children = props.node.children;
     if (!children) return /*#__PURE__*/_react().default.createElement(_uiFoundationUi().ComponentView, _extends({}, props, {
-      treeNodeSlot: treeNodeSlot
-      /**
-       * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace
-       * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version
-       * which makes it incompatible with all other components in this workspace
-       *
-       * hopefully when wave gets released it becomes seamless to update all dependents for a given version
-       */,
-      useLanes: useLanes,
+      treeNodeSlot: treeNodeSlot,
       scopeName: host?.name
     }));
 

package/dist/scope.ui.drawer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","data","_interopRequireWildcard","require","_componentUi","_uiFoundationUi","_lanesHooks","_lanesHooks2","_scopeUiHooks","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","scopeDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","assumeScopeInUrl","overrideUseComponents","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","customScopeTreeNodeRenderer","treeNodeSlot","host","TreeNode","props","children","node","createElement","ComponentView","scopeName","name","payload","ScopePayload","scopeNameFromNode","id","slice","scope","ScopeTreeNode","Fragment","map","childNode","key","NamespaceTreeNode","ComponentsDrawer","order","plugins","tree","widgets","customRenderer","filters","drawerWidgets","useHost","useScope","emptyMessage","transformTree","rootNode","thisScopeIndex","findIndex","undefined","thisScope","concat","useComponents","lanesModel","loading","lanesLoading","viewedLaneId","viewedLane","components","laneComponents","laneCompsLoading","useLaneComponents","isDefault","mainComponents","useContext","ScopeContext","mergeComponents","exports","mainComponentsThatAreNotOnLane","filter","mainComponent","find","laneComponent","toStringWithoutVersion"],"sources":["scope.ui.drawer.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { ComponentsDrawer, ComponentFiltersSlot, DrawerWidgetSlot } from '@teambit/component.ui.component-drawer';\nimport { ComponentView, NamespaceTreeNode, ScopePayload, ScopeTreeNode } from '@teambit/ui-foundation.ui.side-bar';\nimport type { PayloadType } from '@teambit/ui-foundation.ui.side-bar';\nimport { TreeNode as TreeNodeType, TreeNodeProps } from '@teambit/design.ui.tree';\nimport { useLanes as defaultUseLanesHook } from '@teambit/lanes.hooks.use-lanes';\nimport { useLaneComponents } from '@teambit/lanes.hooks.use-lane-components';\nimport { ComponentModel } from '@teambit/component';\nimport { useScope, ScopeContext } from '@teambit/scope.ui.hooks.scope-context';\nimport { LanesModel } from '@teambit/lanes.ui.models.lanes-model';\nimport { SidebarSlot } from './scope.ui.runtime';\n\nexport type ScopeDrawerProps = {\n  treeWidgets: SidebarSlot;\n  filtersSlot: ComponentFiltersSlot;\n  drawerWidgetSlot: DrawerWidgetSlot;\n  assumeScopeInUrl?: boolean;\n  overrideUseComponents?: () => { components: ComponentModel[] };\n  overrideUseLanes?: () => { lanesModel?: LanesModel; loading?: boolean };\n};\n\nexport const scopeDrawer = ({\n  treeWidgets,\n  filtersSlot,\n  drawerWidgetSlot,\n  assumeScopeInUrl = false,\n  overrideUseComponents,\n  overrideUseLanes: useLanesFromProps,\n}: ScopeDrawerProps) => {\n  const useLanes = useLanesFromProps || defaultUseLanesHook;\n\n  const customScopeTreeNodeRenderer = (treeNodeSlot, host?: any) =>\n    function TreeNode(props: TreeNodeProps<PayloadType>) {\n      const children = props.node.children;\n\n      if (!children)\n        return (\n          <ComponentView\n            {...props}\n            treeNodeSlot={treeNodeSlot}\n            /**\n             * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace\n             * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version\n             * which makes it incompatible with all other components in this workspace\n             *\n             * hopefully when wave gets released it becomes seamless to update all dependents for a given version\n             */\n            useLanes={useLanes as any}\n            scopeName={host?.name}\n          />\n        );\n\n      // skip over scope node and render only children\n      if (props.node.payload instanceof ScopePayload) {\n        const scopeNameFromNode = props.node.id.slice(0, -1);\n        const scope = host?.name;\n\n        /**\n         * this is only valid when viewing component from a lane\n         * if the lane component is from a different scope than the current scope\n         * show the scope node\n         */\n        if (scopeNameFromNode !== scope) {\n          return <ScopeTreeNode {...props} />;\n        }\n\n        return (\n          <>\n            {children.map((childNode) => (\n              <TreeNode key={childNode.id} {...props} node={childNode}></TreeNode>\n            ))}\n          </>\n        );\n      }\n\n      return <NamespaceTreeNode {...props} />;\n    };\n\n  return new ComponentsDrawer({\n    assumeScopeInUrl,\n    order: 0,\n    id: 'scope-components-drawer',\n    name: 'COMPONENTS',\n    plugins: {\n      tree: {\n        widgets: treeWidgets,\n        customRenderer: customScopeTreeNodeRenderer,\n      },\n      filters: filtersSlot,\n      drawerWidgets: drawerWidgetSlot,\n    },\n    useHost: () => useScope(),\n    useLanes,\n    emptyMessage: 'Scope is empty',\n    // TODO: create an interface for Component host.\n    transformTree: (host?: any) => {\n      return (rootNode: TreeNodeType) => {\n        const thisScopeIndex = rootNode.children?.findIndex((node) => {\n          if (!(node.payload instanceof ScopePayload)) return undefined;\n          const scopeNameFromNode = node.id.slice(0, -1);\n          return scopeNameFromNode === host?.name;\n        });\n\n        const thisScope =\n          rootNode.children && thisScopeIndex !== undefined ? rootNode.children[thisScopeIndex] : undefined;\n\n        if (thisScope && thisScope.children && rootNode.children) {\n          delete rootNode.children[thisScopeIndex as number];\n          const children = rootNode.children.concat(thisScope.children);\n          rootNode.children = children;\n        }\n\n        return rootNode;\n      };\n    },\n    useComponents:\n      overrideUseComponents ||\n      (() => {\n        const { lanesModel, loading: lanesLoading } = useLanes();\n        const viewedLaneId = lanesModel?.viewedLane?.id;\n\n        const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(\n          viewedLaneId?.isDefault() ? undefined : viewedLaneId\n        );\n        const { components: mainComponents } = useContext(ScopeContext);\n        // lane components + main components\n        const components = mergeComponents(mainComponents, laneComponents);\n\n        return {\n          loading: lanesLoading || laneCompsLoading,\n          components,\n        };\n      }),\n  });\n};\n\nfunction mergeComponents(mainComponents: ComponentModel[], laneComponents: ComponentModel[]): ComponentModel[] {\n  const mainComponentsThatAreNotOnLane = mainComponents.filter((mainComponent) => {\n    return !laneComponents.find(\n      (laneComponent) => laneComponent.id.toStringWithoutVersion() === mainComponent.id.toStringWithoutVersion()\n    );\n  });\n  return laneComponents.concat(mainComponentsThatAreNotOnLane);\n}\n"],"mappings":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,uBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,gBAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,aAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,YAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA+E,SAAAQ,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAR,wBAAAQ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAW,SAAA,WAAAA,QAAA,GAAAR,MAAA,CAAAS,MAAA,GAAAT,MAAA,CAAAS,MAAA,CAAAC,IAAA,eAAAb,CAAA,aAAAR,CAAA,MAAAA,CAAA,GAAAsB,SAAA,CAAAC,MAAA,EAAAvB,CAAA,UAAAG,CAAA,GAAAmB,SAAA,CAAAtB,CAAA,YAAAE,CAAA,IAAAC,CAAA,OAAAY,cAAA,CAAAC,IAAA,CAAAb,CAAA,EAAAD,CAAA,MAAAM,CAAA,CAAAN,CAAA,IAAAC,CAAA,CAAAD,CAAA,aAAAM,CAAA,KAAAW,QAAA,CAAAK,KAAA,OAAAF,SAAA;AAaxE,MAAMG,WAAW,GAAGA,CAAC;EAC1BC,WAAW;EACXC,WAAW;EACXC,gBAAgB;EAChBC,gBAAgB,GAAG,KAAK;EACxBC,qBAAqB;EACrBC,gBAAgB,EAAEC;AACF,CAAC,KAAK;EACtB,MAAMC,QAAQ,GAAGD,iBAAiB,IAAIE,sBAAmB;EAEzD,MAAMC,2BAA2B,GAAGA,CAACC,YAAY,EAAEC,IAAU,KAC3D,SAASC,QAAQA,CAACC,KAAiC,EAAE;IACnD,MAAMC,QAAQ,GAAGD,KAAK,CAACE,IAAI,CAACD,QAAQ;IAEpC,IAAI,CAACA,QAAQ,EACX,oBACElD,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAAgD,aAAa,EAAAxB,QAAA,KACRoB,KAAK;MACTH,YAAY,EAAEA;MACd;AACZ;AACA;AACA;AACA;AACA;AACA,SANY;MAOAH,QAAQ,EAAEA,QAAgB;MAC1BW,SAAS,EAAEP,IAAI,EAAEQ;IAAK,EACvB,CAAC;;IAGN;IACA,IAAIN,KAAK,CAACE,IAAI,CAACK,OAAO,YAAYC,8BAAY,EAAE;MAC9C,MAAMC,iBAAiB,GAAGT,KAAK,CAACE,IAAI,CAACQ,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;MACpD,MAAMC,KAAK,GAAGd,IAAI,EAAEQ,IAAI;;MAExB;AACR;AACA;AACA;AACA;MACQ,IAAIG,iBAAiB,KAAKG,KAAK,EAAE;QAC/B,oBAAO7D,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAAyD,aAAa,EAAKb,KAAQ,CAAC;MACrC;MAEA,oBACEjD,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAApD,MAAA,GAAAe,OAAA,CAAAgD,QAAA,QACGb,QAAQ,CAACc,GAAG,CAAEC,SAAS,iBACtBjE,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAACJ,QAAQ,EAAAnB,QAAA;QAACqC,GAAG,EAAED,SAAS,CAACN;MAAG,GAAKV,KAAK;QAAEE,IAAI,EAAEc;MAAU,EAAW,CACpE,CACD,CAAC;IAEP;IAEA,oBAAOjE,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAA8D,iBAAiB,EAAKlB,KAAQ,CAAC;EACzC,CAAC;EAEH,OAAO,KAAImB,+BAAgB,EAAC;IAC1B7B,gBAAgB;IAChB8B,KAAK,EAAE,CAAC;IACRV,EAAE,EAAE,yBAAyB;IAC7BJ,IAAI,EAAE,YAAY;IAClBe,OAAO,EAAE;MACPC,IAAI,EAAE;QACJC,OAAO,EAAEpC,WAAW;QACpBqC,cAAc,EAAE5B;MAClB,CAAC;MACD6B,OAAO,EAAErC,WAAW;MACpBsC,aAAa,EAAErC;IACjB,CAAC;IACDsC,OAAO,EAAEA,CAAA,KAAM,IAAAC,wBAAQ,EAAC,CAAC;IACzBlC,QAAQ;IACRmC,YAAY,EAAE,gBAAgB;IAC9B;IACAC,aAAa,EAAGhC,IAAU,IAAK;MAC7B,OAAQiC,QAAsB,IAAK;QACjC,MAAMC,cAAc,GAAGD,QAAQ,CAAC9B,QAAQ,EAAEgC,SAAS,CAAE/B,IAAI,IAAK;UAC5D,IAAI,EAAEA,IAAI,CAACK,OAAO,YAAYC,8BAAY,CAAC,EAAE,OAAO0B,SAAS;UAC7D,MAAMzB,iBAAiB,GAAGP,IAAI,CAACQ,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;UAC9C,OAAOF,iBAAiB,KAAKX,IAAI,EAAEQ,IAAI;QACzC,CAAC,CAAC;QAEF,MAAM6B,SAAS,GACbJ,QAAQ,CAAC9B,QAAQ,IAAI+B,cAAc,KAAKE,SAAS,GAAGH,QAAQ,CAAC9B,QAAQ,CAAC+B,cAAc,CAAC,GAAGE,SAAS;QAEnG,IAAIC,SAAS,IAAIA,SAAS,CAAClC,QAAQ,IAAI8B,QAAQ,CAAC9B,QAAQ,EAAE;UACxD,OAAO8B,QAAQ,CAAC9B,QAAQ,CAAC+B,cAAc,CAAW;UAClD,MAAM/B,QAAQ,GAAG8B,QAAQ,CAAC9B,QAAQ,CAACmC,MAAM,CAACD,SAAS,CAAClC,QAAQ,CAAC;UAC7D8B,QAAQ,CAAC9B,QAAQ,GAAGA,QAAQ;QAC9B;QAEA,OAAO8B,QAAQ;MACjB,CAAC;IACH,CAAC;IACDM,aAAa,EACX9C,qBAAqB,KACpB,MAAM;MACL,MAAM;QAAE+C,UAAU;QAAEC,OAAO,EAAEC;MAAa,CAAC,GAAG9C,QAAQ,CAAC,CAAC;MACxD,MAAM+C,YAAY,GAAGH,UAAU,EAAEI,UAAU,EAAEhC,EAAE;MAE/C,MAAM;QAAEiC,UAAU,EAAEC,cAAc,GAAG,EAAE;QAAEL,OAAO,EAAEM;MAAiB,CAAC,GAAG,IAAAC,gCAAiB,EACtFL,YAAY,EAAEM,SAAS,CAAC,CAAC,GAAGb,SAAS,GAAGO,YAC1C,CAAC;MACD,MAAM;QAAEE,UAAU,EAAEK;MAAe,CAAC,GAAG,IAAAC,mBAAU,EAACC,4BAAY,CAAC;MAC/D;MACA,MAAMP,UAAU,GAAGQ,eAAe,CAACH,cAAc,EAAEJ,cAAc,CAAC;MAElE,OAAO;QACLL,OAAO,EAAEC,YAAY,IAAIK,gBAAgB;QACzCF;MACF,CAAC;IACH,CAAC;EACL,CAAC,CAAC;AACJ,CAAC;AAACS,OAAA,CAAAlE,WAAA,GAAAA,WAAA;AAEF,SAASiE,eAAeA,CAACH,cAAgC,EAAEJ,cAAgC,EAAoB;EAC7G,MAAMS,8BAA8B,GAAGL,cAAc,CAACM,MAAM,CAAEC,aAAa,IAAK;IAC9E,OAAO,CAACX,cAAc,CAACY,IAAI,CACxBC,aAAa,IAAKA,aAAa,CAAC/C,EAAE,CAACgD,sBAAsB,CAAC,CAAC,KAAKH,aAAa,CAAC7C,EAAE,CAACgD,sBAAsB,CAAC,CAC3G,CAAC;EACH,CAAC,CAAC;EACF,OAAOd,cAAc,CAACR,MAAM,CAACiB,8BAA8B,CAAC;AAC9D","ignoreList":[]}
+{"version":3,"names":["_react","data","_interopRequireWildcard","require","_componentUi","_uiFoundationUi","_lanesHooks","_lanesHooks2","_scopeUiHooks","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","scopeDrawer","treeWidgets","filtersSlot","drawerWidgetSlot","assumeScopeInUrl","overrideUseComponents","overrideUseLanes","useLanesFromProps","useLanes","defaultUseLanesHook","customScopeTreeNodeRenderer","treeNodeSlot","host","TreeNode","props","children","node","createElement","ComponentView","scopeName","name","payload","ScopePayload","scopeNameFromNode","id","slice","scope","ScopeTreeNode","Fragment","map","childNode","key","NamespaceTreeNode","ComponentsDrawer","order","plugins","tree","widgets","customRenderer","filters","drawerWidgets","useHost","useScope","emptyMessage","transformTree","rootNode","thisScopeIndex","findIndex","undefined","thisScope","concat","useComponents","lanesModel","loading","lanesLoading","viewedLaneId","viewedLane","components","laneComponents","laneCompsLoading","useLaneComponents","isDefault","mainComponents","useContext","ScopeContext","mergeComponents","exports","mainComponentsThatAreNotOnLane","filter","mainComponent","find","laneComponent","toStringWithoutVersion"],"sources":["scope.ui.drawer.tsx"],"sourcesContent":["import React, { useContext } from 'react';\nimport { ComponentsDrawer, ComponentFiltersSlot, DrawerWidgetSlot } from '@teambit/component.ui.component-drawer';\nimport { ComponentView, NamespaceTreeNode, ScopePayload, ScopeTreeNode } from '@teambit/ui-foundation.ui.side-bar';\nimport type { PayloadType } from '@teambit/ui-foundation.ui.side-bar';\nimport { TreeNode as TreeNodeType, TreeNodeProps } from '@teambit/design.ui.tree';\nimport { useLanes as defaultUseLanesHook } from '@teambit/lanes.hooks.use-lanes';\nimport { useLaneComponents } from '@teambit/lanes.hooks.use-lane-components';\nimport { ComponentModel } from '@teambit/component';\nimport { useScope, ScopeContext } from '@teambit/scope.ui.hooks.scope-context';\nimport { LanesModel } from '@teambit/lanes.ui.models.lanes-model';\nimport { SidebarSlot } from './scope.ui.runtime';\n\nexport type ScopeDrawerProps = {\n  treeWidgets: SidebarSlot;\n  filtersSlot: ComponentFiltersSlot;\n  drawerWidgetSlot: DrawerWidgetSlot;\n  assumeScopeInUrl?: boolean;\n  overrideUseComponents?: () => { components: ComponentModel[] };\n  overrideUseLanes?: () => { lanesModel?: LanesModel; loading?: boolean };\n};\n\nexport const scopeDrawer = ({\n  treeWidgets,\n  filtersSlot,\n  drawerWidgetSlot,\n  assumeScopeInUrl = false,\n  overrideUseComponents,\n  overrideUseLanes: useLanesFromProps,\n}: ScopeDrawerProps) => {\n  const useLanes = useLanesFromProps || defaultUseLanesHook;\n\n  const customScopeTreeNodeRenderer = (treeNodeSlot, host?: any) =>\n    function TreeNode(props: TreeNodeProps<PayloadType>) {\n      const children = props.node.children;\n\n      if (!children) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} scopeName={host?.name} />;\n\n      // skip over scope node and render only children\n      if (props.node.payload instanceof ScopePayload) {\n        const scopeNameFromNode = props.node.id.slice(0, -1);\n        const scope = host?.name;\n\n        /**\n         * this is only valid when viewing component from a lane\n         * if the lane component is from a different scope than the current scope\n         * show the scope node\n         */\n        if (scopeNameFromNode !== scope) {\n          return <ScopeTreeNode {...props} />;\n        }\n\n        return (\n          <>\n            {children.map((childNode) => (\n              <TreeNode key={childNode.id} {...props} node={childNode}></TreeNode>\n            ))}\n          </>\n        );\n      }\n\n      return <NamespaceTreeNode {...props} />;\n    };\n\n  return new ComponentsDrawer({\n    assumeScopeInUrl,\n    order: 0,\n    id: 'scope-components-drawer',\n    name: 'COMPONENTS',\n    plugins: {\n      tree: {\n        widgets: treeWidgets,\n        customRenderer: customScopeTreeNodeRenderer,\n      },\n      filters: filtersSlot,\n      drawerWidgets: drawerWidgetSlot,\n    },\n    useHost: () => useScope(),\n    useLanes,\n    emptyMessage: 'Scope is empty',\n    // TODO: create an interface for Component host.\n    transformTree: (host?: any) => {\n      return (rootNode: TreeNodeType) => {\n        const thisScopeIndex = rootNode.children?.findIndex((node) => {\n          if (!(node.payload instanceof ScopePayload)) return undefined;\n          const scopeNameFromNode = node.id.slice(0, -1);\n          return scopeNameFromNode === host?.name;\n        });\n\n        const thisScope =\n          rootNode.children && thisScopeIndex !== undefined ? rootNode.children[thisScopeIndex] : undefined;\n\n        if (thisScope && thisScope.children && rootNode.children) {\n          delete rootNode.children[thisScopeIndex as number];\n          const children = rootNode.children.concat(thisScope.children);\n          rootNode.children = children;\n        }\n\n        return rootNode;\n      };\n    },\n    useComponents:\n      overrideUseComponents ||\n      (() => {\n        const { lanesModel, loading: lanesLoading } = useLanes();\n        const viewedLaneId = lanesModel?.viewedLane?.id;\n\n        const { components: laneComponents = [], loading: laneCompsLoading } = useLaneComponents(\n          viewedLaneId?.isDefault() ? undefined : viewedLaneId\n        );\n        const { components: mainComponents } = useContext(ScopeContext);\n        // lane components + main components\n        const components = mergeComponents(mainComponents, laneComponents);\n\n        return {\n          loading: lanesLoading || laneCompsLoading,\n          components,\n        };\n      }),\n  });\n};\n\nfunction mergeComponents(mainComponents: ComponentModel[], laneComponents: ComponentModel[]): ComponentModel[] {\n  const mainComponentsThatAreNotOnLane = mainComponents.filter((mainComponent) => {\n    return !laneComponents.find(\n      (laneComponent) => laneComponent.id.toStringWithoutVersion() === mainComponent.id.toStringWithoutVersion()\n    );\n  });\n  return laneComponents.concat(mainComponentsThatAreNotOnLane);\n}\n"],"mappings":";;;;;;AAAA,SAAAA,OAAA;EAAA,MAAAC,IAAA,GAAAC,uBAAA,CAAAC,OAAA;EAAAH,MAAA,YAAAA,CAAA;IAAA,OAAAC,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAG,aAAA;EAAA,MAAAH,IAAA,GAAAE,OAAA;EAAAC,YAAA,YAAAA,CAAA;IAAA,OAAAH,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAI,gBAAA;EAAA,MAAAJ,IAAA,GAAAE,OAAA;EAAAE,eAAA,YAAAA,CAAA;IAAA,OAAAJ,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAGA,SAAAK,YAAA;EAAA,MAAAL,IAAA,GAAAE,OAAA;EAAAG,WAAA,YAAAA,CAAA;IAAA,OAAAL,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AACA,SAAAM,aAAA;EAAA,MAAAN,IAAA,GAAAE,OAAA;EAAAI,YAAA,YAAAA,CAAA;IAAA,OAAAN,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAEA,SAAAO,cAAA;EAAA,MAAAP,IAAA,GAAAE,OAAA;EAAAK,aAAA,YAAAA,CAAA;IAAA,OAAAP,IAAA;EAAA;EAAA,OAAAA,IAAA;AAAA;AAA+E,SAAAQ,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAR,wBAAAQ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAW,SAAA,WAAAA,QAAA,GAAAR,MAAA,CAAAS,MAAA,GAAAT,MAAA,CAAAS,MAAA,CAAAC,IAAA,eAAAb,CAAA,aAAAR,CAAA,MAAAA,CAAA,GAAAsB,SAAA,CAAAC,MAAA,EAAAvB,CAAA,UAAAG,CAAA,GAAAmB,SAAA,CAAAtB,CAAA,YAAAE,CAAA,IAAAC,CAAA,OAAAY,cAAA,CAAAC,IAAA,CAAAb,CAAA,EAAAD,CAAA,MAAAM,CAAA,CAAAN,CAAA,IAAAC,CAAA,CAAAD,CAAA,aAAAM,CAAA,KAAAW,QAAA,CAAAK,KAAA,OAAAF,SAAA;AAaxE,MAAMG,WAAW,GAAGA,CAAC;EAC1BC,WAAW;EACXC,WAAW;EACXC,gBAAgB;EAChBC,gBAAgB,GAAG,KAAK;EACxBC,qBAAqB;EACrBC,gBAAgB,EAAEC;AACF,CAAC,KAAK;EACtB,MAAMC,QAAQ,GAAGD,iBAAiB,IAAIE,sBAAmB;EAEzD,MAAMC,2BAA2B,GAAGA,CAACC,YAAY,EAAEC,IAAU,KAC3D,SAASC,QAAQA,CAACC,KAAiC,EAAE;IACnD,MAAMC,QAAQ,GAAGD,KAAK,CAACE,IAAI,CAACD,QAAQ;IAEpC,IAAI,CAACA,QAAQ,EAAE,oBAAOlD,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAAgD,aAAa,EAAAxB,QAAA,KAAKoB,KAAK;MAAEH,YAAY,EAAEA,YAAa;MAACQ,SAAS,EAAEP,IAAI,EAAEQ;IAAK,EAAE,CAAC;;IAErG;IACA,IAAIN,KAAK,CAACE,IAAI,CAACK,OAAO,YAAYC,8BAAY,EAAE;MAC9C,MAAMC,iBAAiB,GAAGT,KAAK,CAACE,IAAI,CAACQ,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;MACpD,MAAMC,KAAK,GAAGd,IAAI,EAAEQ,IAAI;;MAExB;AACR;AACA;AACA;AACA;MACQ,IAAIG,iBAAiB,KAAKG,KAAK,EAAE;QAC/B,oBAAO7D,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAAyD,aAAa,EAAKb,KAAQ,CAAC;MACrC;MAEA,oBACEjD,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAApD,MAAA,GAAAe,OAAA,CAAAgD,QAAA,QACGb,QAAQ,CAACc,GAAG,CAAEC,SAAS,iBACtBjE,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAACJ,QAAQ,EAAAnB,QAAA;QAACqC,GAAG,EAAED,SAAS,CAACN;MAAG,GAAKV,KAAK;QAAEE,IAAI,EAAEc;MAAU,EAAW,CACpE,CACD,CAAC;IAEP;IAEA,oBAAOjE,MAAA,GAAAe,OAAA,CAAAqC,aAAA,CAAC/C,eAAA,GAAA8D,iBAAiB,EAAKlB,KAAQ,CAAC;EACzC,CAAC;EAEH,OAAO,KAAImB,+BAAgB,EAAC;IAC1B7B,gBAAgB;IAChB8B,KAAK,EAAE,CAAC;IACRV,EAAE,EAAE,yBAAyB;IAC7BJ,IAAI,EAAE,YAAY;IAClBe,OAAO,EAAE;MACPC,IAAI,EAAE;QACJC,OAAO,EAAEpC,WAAW;QACpBqC,cAAc,EAAE5B;MAClB,CAAC;MACD6B,OAAO,EAAErC,WAAW;MACpBsC,aAAa,EAAErC;IACjB,CAAC;IACDsC,OAAO,EAAEA,CAAA,KAAM,IAAAC,wBAAQ,EAAC,CAAC;IACzBlC,QAAQ;IACRmC,YAAY,EAAE,gBAAgB;IAC9B;IACAC,aAAa,EAAGhC,IAAU,IAAK;MAC7B,OAAQiC,QAAsB,IAAK;QACjC,MAAMC,cAAc,GAAGD,QAAQ,CAAC9B,QAAQ,EAAEgC,SAAS,CAAE/B,IAAI,IAAK;UAC5D,IAAI,EAAEA,IAAI,CAACK,OAAO,YAAYC,8BAAY,CAAC,EAAE,OAAO0B,SAAS;UAC7D,MAAMzB,iBAAiB,GAAGP,IAAI,CAACQ,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;UAC9C,OAAOF,iBAAiB,KAAKX,IAAI,EAAEQ,IAAI;QACzC,CAAC,CAAC;QAEF,MAAM6B,SAAS,GACbJ,QAAQ,CAAC9B,QAAQ,IAAI+B,cAAc,KAAKE,SAAS,GAAGH,QAAQ,CAAC9B,QAAQ,CAAC+B,cAAc,CAAC,GAAGE,SAAS;QAEnG,IAAIC,SAAS,IAAIA,SAAS,CAAClC,QAAQ,IAAI8B,QAAQ,CAAC9B,QAAQ,EAAE;UACxD,OAAO8B,QAAQ,CAAC9B,QAAQ,CAAC+B,cAAc,CAAW;UAClD,MAAM/B,QAAQ,GAAG8B,QAAQ,CAAC9B,QAAQ,CAACmC,MAAM,CAACD,SAAS,CAAClC,QAAQ,CAAC;UAC7D8B,QAAQ,CAAC9B,QAAQ,GAAGA,QAAQ;QAC9B;QAEA,OAAO8B,QAAQ;MACjB,CAAC;IACH,CAAC;IACDM,aAAa,EACX9C,qBAAqB,KACpB,MAAM;MACL,MAAM;QAAE+C,UAAU;QAAEC,OAAO,EAAEC;MAAa,CAAC,GAAG9C,QAAQ,CAAC,CAAC;MACxD,MAAM+C,YAAY,GAAGH,UAAU,EAAEI,UAAU,EAAEhC,EAAE;MAE/C,MAAM;QAAEiC,UAAU,EAAEC,cAAc,GAAG,EAAE;QAAEL,OAAO,EAAEM;MAAiB,CAAC,GAAG,IAAAC,gCAAiB,EACtFL,YAAY,EAAEM,SAAS,CAAC,CAAC,GAAGb,SAAS,GAAGO,YAC1C,CAAC;MACD,MAAM;QAAEE,UAAU,EAAEK;MAAe,CAAC,GAAG,IAAAC,mBAAU,EAACC,4BAAY,CAAC;MAC/D;MACA,MAAMP,UAAU,GAAGQ,eAAe,CAACH,cAAc,EAAEJ,cAAc,CAAC;MAElE,OAAO;QACLL,OAAO,EAAEC,YAAY,IAAIK,gBAAgB;QACzCF;MACF,CAAC;IACH,CAAC;EACL,CAAC,CAAC;AACJ,CAAC;AAACS,OAAA,CAAAlE,WAAA,GAAAA,WAAA;AAEF,SAASiE,eAAeA,CAACH,cAAgC,EAAEJ,cAAgC,EAAoB;EAC7G,MAAMS,8BAA8B,GAAGL,cAAc,CAACM,MAAM,CAAEC,aAAa,IAAK;IAC9E,OAAO,CAACX,cAAc,CAACY,IAAI,CACxBC,aAAa,IAAKA,aAAa,CAAC/C,EAAE,CAACgD,sBAAsB,CAAC,CAAC,KAAKH,aAAa,CAAC7C,EAAE,CAACgD,sBAAsB,CAAC,CAC3G,CAAC;EACH,CAAC,CAAC;EACF,OAAOd,cAAc,CAACR,MAAM,CAACiB,8BAA8B,CAAC;AAC9D","ignoreList":[]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/scope",
-  "version": "1.0.420",
+  "version": "1.0.421",
   "homepage": "https://bit.cloud/teambit/scope/scope",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.scope",
     "name": "scope",
-    "version": "1.0.420"
+    "version": "1.0.421"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -28,7 +28,6 @@
     "@teambit/legacy-bit-id": "1.1.1",
     "@teambit/design.ui.tree": "0.0.15",
     "@teambit/lanes.ui.models.lanes-model": "0.0.221",
-    "@teambit/ui-foundation.ui.side-bar": "0.0.884",
     "@teambit/design.ui.surfaces.menu.link-item": "1.0.0",
     "@teambit/ui-foundation.ui.main-dropdown": "0.0.502",
     "@teambit/ui-foundation.ui.menu": "0.0.502",
@@ -49,40 +48,41 @@
     "@teambit/scope.ui.empty-scope": "0.0.509",
     "@teambit/scope.ui.scope-details": "0.0.526",
     "@teambit/scopes.scope-id": "0.0.7",
-    "@teambit/cli": "0.0.997",
+    "@teambit/cli": "0.0.998",
     "@teambit/component.modules.component-url": "0.0.169",
     "@teambit/scope.models.scope-model": "0.0.515",
     "@teambit/scope.ui.hooks.scope-context": "0.0.509",
-    "@teambit/aspect-loader": "1.0.420",
-    "@teambit/compiler": "1.0.420",
-    "@teambit/component": "1.0.420",
-    "@teambit/dependency-resolver": "1.0.420",
-    "@teambit/envs": "1.0.420",
-    "@teambit/global-config": "0.0.1000",
+    "@teambit/aspect-loader": "1.0.421",
+    "@teambit/compiler": "1.0.421",
+    "@teambit/component": "1.0.421",
+    "@teambit/dependency-resolver": "1.0.421",
+    "@teambit/envs": "1.0.421",
+    "@teambit/global-config": "0.0.1001",
     "@teambit/harmony.modules.requireable-component": "0.0.497",
-    "@teambit/isolator": "1.0.420",
-    "@teambit/logger": "0.0.1090",
+    "@teambit/isolator": "1.0.421",
+    "@teambit/logger": "0.0.1091",
     "@teambit/harmony.modules.in-memory-cache": "0.0.2",
     "@teambit/bit.get-bit-version": "0.0.1",
     "@teambit/legacy-component-log": "0.0.403",
     "@teambit/legacy.scope-api": "0.0.36",
-    "@teambit/builder": "1.0.420",
-    "@teambit/express": "0.0.1096",
-    "@teambit/graph": "1.0.420",
-    "@teambit/graphql": "1.0.420",
-    "@teambit/ui": "1.0.420",
+    "@teambit/builder": "1.0.421",
+    "@teambit/express": "0.0.1097",
+    "@teambit/graph": "1.0.421",
+    "@teambit/graphql": "1.0.421",
+    "@teambit/ui": "1.0.421",
     "@teambit/workspace.modules.match-pattern": "0.0.505",
-    "@teambit/component.ui.component-drawer": "0.0.413",
+    "@teambit/component.ui.component-drawer": "0.0.414",
     "@teambit/lanes.hooks.use-lane-components": "0.0.269",
-    "@teambit/lanes.hooks.use-lanes": "0.0.273",
-    "@teambit/command-bar": "1.0.420",
-    "@teambit/component-tree": "1.0.420",
-    "@teambit/component.ui.component-filters.component-filter-context": "0.0.228",
-    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.226",
-    "@teambit/component.ui.component-filters.env-filter": "0.0.238",
-    "@teambit/component.ui.component-filters.show-main-filter": "0.0.219",
-    "@teambit/sidebar": "1.0.420",
-    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.510",
+    "@teambit/lanes.hooks.use-lanes": "0.0.274",
+    "@teambit/ui-foundation.ui.side-bar": "0.0.886",
+    "@teambit/command-bar": "1.0.421",
+    "@teambit/component-tree": "1.0.421",
+    "@teambit/component.ui.component-filters.component-filter-context": "0.0.229",
+    "@teambit/component.ui.component-filters.deprecate-filter": "0.0.227",
+    "@teambit/component.ui.component-filters.env-filter": "0.0.239",
+    "@teambit/component.ui.component-filters.show-main-filter": "0.0.220",
+    "@teambit/sidebar": "1.0.421",
+    "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.511",
     "@teambit/ui-foundation.ui.buttons.collapser": "0.0.223",
     "@teambit/component-descriptor": "0.0.426",
     "@teambit/design.ui.tooltip": "0.0.371",

package/scope.ui.drawer.tsx

@@ -33,22 +33,7 @@ export const scopeDrawer = ({
     function TreeNode(props: TreeNodeProps<PayloadType>) {
       const children = props.node.children;
 
-      if (!children)
-        return (
-          <ComponentView
-            {...props}
-            treeNodeSlot={treeNodeSlot}
-            /**
-             * this is a hack to get around incompatible component id b/w the new sidebar and components in this workspace
-             * the new sidebar has been tagged with the new LanesModel component which has been upgraded to a new major component id version
-             * which makes it incompatible with all other components in this workspace
-             *
-             * hopefully when wave gets released it becomes seamless to update all dependents for a given version
-             */
-            useLanes={useLanes as any}
-            scopeName={host?.name}
-          />
-        );
+      if (!children) return <ComponentView {...props} treeNodeSlot={treeNodeSlot} scopeName={host?.name} />;
 
       // skip over scope node and render only children
       if (props.node.payload instanceof ScopePayload) {