@opensumi/ide-main-layout 2.25.0 → 2.25.1-next-1686563932.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"panel.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,qBAAqB,EAOtB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAoBjE,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QAAE,SAAS,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAE1F,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA2CvD,CAAC;AAmGH,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAyD,CAAC;AAEpG,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAyD,CAAC;AAEnG,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAA2E,CAAC"}
1
+ {"version":3,"file":"panel.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,qBAAqB,EAOtB,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,KAAK,EAAE,MAAM,0CAA0C,CAAC;AAoBjE,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC;QAAE,SAAS,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,KAAK,CAAA;KAAE,CAAC,CAAC;IAE1F,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CA2CvD,CAAC;AAsHH,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAyD,CAAC;AAEpG,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAyD,CAAC;AAEnG,eAAO,MAAM,sBAAsB,EAAE,KAAK,CAAC,EAA2E,CAAC"}
@@ -77,24 +77,33 @@ const ContainerView = ({ component, titleMenu, side }) => {
77
77
  react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { initialProps: Object.assign({ viewState }, (_b = component.options) === null || _b === void 0 ? void 0 : _b.initialProps), Component: CustomComponent }))) : (react_1.default.createElement(accordion_view_1.AccordionContainer, { views: component.views, minSize: component.options.miniSize, containerId: component.options.containerId })))));
78
78
  };
79
79
  const BottomPanelView = ({ component, titleMenu, side }) => {
80
- var _a, _b, _c, _d, _e;
81
- const contentRef = react_1.default.useRef();
82
- const titleComponent = component.options && component.options.titleComponent;
80
+ var _a, _b, _c, _d;
81
+ const ref = react_1.default.useRef();
82
+ const containerRef = react_1.default.useRef(null);
83
+ const configContext = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
83
84
  const tabbarService = (0, ide_core_browser_1.useInjectable)(tabbar_service_1.TabbarServiceFactory)(side);
84
- // 注入自定义视图 or 通过views注入视图
85
+ const { component: CustomComponent, containerId } = component.options || {};
86
+ const titleComponent = component.options && component.options.titleComponent;
87
+ if (!containerId) {
88
+ return null;
89
+ }
85
90
  const progressService = (0, ide_core_browser_1.useInjectable)(progress_1.IProgressService);
86
- const indicator = progressService.getIndicator(component.options.containerId);
87
- const viewState = (0, ide_core_browser_1.useViewState)(side, contentRef);
88
- return (react_1.default.createElement("div", { className: styles_module_less_1.default.panel_container },
91
+ const indicator = progressService.getIndicator(containerId);
92
+ if (!indicator) {
93
+ return null;
94
+ }
95
+ const viewState = (0, ide_core_browser_1.useViewState)(side, containerRef);
96
+ return (react_1.default.createElement("div", { ref: containerRef, className: styles_module_less_1.default.panel_container },
89
97
  react_1.default.createElement("div", { className: styles_module_less_1.default.panel_title_bar, style: { height: constants_1.LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT } },
90
98
  react_1.default.createElement("h1", null, (_b = (_a = component.options) === null || _a === void 0 ? void 0 : _a.title) === null || _b === void 0 ? void 0 : _b.toUpperCase()),
91
99
  react_1.default.createElement("div", { className: styles_module_less_1.default.title_component_container }, titleComponent && (react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { Component: titleComponent, initialProps: (_c = component.options) === null || _c === void 0 ? void 0 : _c.titleProps }))),
92
100
  react_1.default.createElement("div", { className: styles_module_less_1.default.panel_toolbar_container },
93
101
  titleMenu && react_1.default.createElement(actions_1.InlineActionBar, { menus: titleMenu }),
94
102
  react_1.default.createElement(actions_1.InlineMenuBar, { menus: tabbarService.commonTitleMenu, moreAtFirst: true }))),
95
- react_1.default.createElement("div", { ref: (ele) => (contentRef.current = ele), className: styles_module_less_1.default.panel_wrapper },
103
+ react_1.default.createElement("div", { className: styles_module_less_1.default.container_wrap, ref: (ele) => (ref.current = ele) },
96
104
  react_1.default.createElement(progress_bar_1.ProgressBar, { progressModel: indicator.progressModel }),
97
- react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { initialProps: Object.assign({ viewState }, (_d = component.options) === null || _d === void 0 ? void 0 : _d.initialProps), Component: ((_e = component.options) === null || _e === void 0 ? void 0 : _e.component) ? component.options.component : component.views[0].component }))));
105
+ CustomComponent ? (react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value: configContext },
106
+ react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { initialProps: Object.assign({ viewState }, (_d = component.options) === null || _d === void 0 ? void 0 : _d.initialProps), Component: CustomComponent }))) : (react_1.default.createElement(accordion_view_1.AccordionContainer, { views: component.views, minSize: component.options.miniSize, containerId: component.options.containerId })))));
98
107
  };
99
108
  const RightTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: ContainerView });
100
109
  exports.RightTabPanelRenderer = RightTabPanelRenderer;
@@ -1 +1 @@
1
- {"version":3,"file":"panel.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"panel.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-main-layout",
3
- "version": "2.25.0",
3
+ "version": "2.25.1-next-1686563932.0",
4
4
  "description": "@opensumi/ide-main-layout",
5
5
  "files": [
6
6
  "lib",
@@ -18,13 +18,13 @@
18
18
  "url": "git@github.com:opensumi/core.git"
19
19
  },
20
20
  "dependencies": {
21
- "@opensumi/ide-components": "2.25.0",
22
- "@opensumi/ide-core-common": "2.25.0"
21
+ "@opensumi/ide-components": "2.25.1-next-1686563932.0",
22
+ "@opensumi/ide-core-common": "2.25.1-next-1686563932.0"
23
23
  },
24
24
  "devDependencies": {
25
- "@opensumi/ide-core-browser": "2.25.0",
25
+ "@opensumi/ide-core-browser": "2.25.1-next-1686563932.0",
26
26
  "@opensumi/ide-dev-tool": "1.3.1",
27
- "@opensumi/ide-theme": "2.25.0"
27
+ "@opensumi/ide-theme": "2.25.1-next-1686563932.0"
28
28
  },
29
- "gitHead": "be3a49a97b6bdc4dba2699421f49404f86fc177b"
29
+ "gitHead": "6aeed2b45a61c69297210c883bde02f9cd28c788"
30
30
  }
@@ -150,16 +150,25 @@ const BottomPanelView: React.FC<{
150
150
  side: string;
151
151
  titleMenu: IMenu;
152
152
  }> = ({ component, titleMenu, side }) => {
153
- const contentRef = React.useRef<HTMLDivElement | null>();
154
- const titleComponent = component.options && component.options.titleComponent;
153
+ const ref = React.useRef<HTMLElement | null>();
154
+ const containerRef = React.useRef<HTMLDivElement | null>(null);
155
+ const configContext = useInjectable<AppConfig>(AppConfig);
155
156
  const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
156
- // 注入自定义视图 or 通过views注入视图
157
+ const { component: CustomComponent, containerId } = component.options || {};
158
+ const titleComponent = component.options && component.options.titleComponent;
159
+
160
+ if (!containerId) {
161
+ return null;
162
+ }
157
163
  const progressService: IProgressService = useInjectable(IProgressService);
158
- const indicator = progressService.getIndicator(component.options!.containerId)!;
159
- const viewState = useViewState(side, contentRef);
164
+ const indicator = progressService.getIndicator(containerId);
165
+ if (!indicator) {
166
+ return null;
167
+ }
168
+ const viewState = useViewState(side, containerRef);
160
169
 
161
170
  return (
162
- <div className={styles.panel_container}>
171
+ <div ref={containerRef} className={styles.panel_container}>
163
172
  <div className={styles.panel_title_bar} style={{ height: LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT }}>
164
173
  <h1>{component.options?.title?.toUpperCase()}</h1>
165
174
  <div className={styles.title_component_container}>
@@ -172,12 +181,22 @@ const BottomPanelView: React.FC<{
172
181
  <InlineMenuBar menus={tabbarService.commonTitleMenu} moreAtFirst />
173
182
  </div>
174
183
  </div>
175
- <div ref={(ele) => (contentRef.current = ele)} className={styles.panel_wrapper}>
184
+ <div className={styles.container_wrap} ref={(ele) => (ref.current = ele)}>
176
185
  <ProgressBar progressModel={indicator.progressModel} />
177
- <ComponentRenderer
178
- initialProps={{ viewState, ...component.options?.initialProps }}
179
- Component={component.options?.component ? component.options.component : component.views[0].component!}
180
- />
186
+ {CustomComponent ? (
187
+ <ConfigProvider value={configContext}>
188
+ <ComponentRenderer
189
+ initialProps={{ viewState, ...component.options?.initialProps }}
190
+ Component={CustomComponent}
191
+ />
192
+ </ConfigProvider>
193
+ ) : (
194
+ <AccordionContainer
195
+ views={component.views}
196
+ minSize={component.options!.miniSize}
197
+ containerId={component.options!.containerId}
198
+ />
199
+ )}
181
200
  </div>
182
201
  </div>
183
202
  );