@opensumi/ide-main-layout 2.26.8 → 2.26.9-rc-1695060705.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.
- package/lib/browser/accordion/accordion.view.d.ts.map +1 -1
- package/lib/browser/accordion/accordion.view.js +12 -4
- package/lib/browser/accordion/accordion.view.js.map +1 -1
- package/lib/browser/accordion/section.view.d.ts +1 -1
- package/lib/browser/accordion/section.view.d.ts.map +1 -1
- package/lib/browser/accordion/titlebar.view.d.ts +1 -0
- package/lib/browser/accordion/titlebar.view.d.ts.map +1 -1
- package/lib/browser/accordion/titlebar.view.js +1 -2
- package/lib/browser/accordion/titlebar.view.js.map +1 -1
- package/lib/browser/input/index.d.ts +1 -1
- package/lib/browser/input/index.d.ts.map +1 -1
- package/lib/browser/tabbar/bar.view.d.ts +11 -1
- package/lib/browser/tabbar/bar.view.d.ts.map +1 -1
- package/lib/browser/tabbar/bar.view.js +51 -45
- package/lib/browser/tabbar/bar.view.js.map +1 -1
- package/lib/browser/tabbar/panel.view.d.ts +6 -0
- package/lib/browser/tabbar/panel.view.d.ts.map +1 -1
- package/lib/browser/tabbar/panel.view.js +17 -14
- package/lib/browser/tabbar/panel.view.js.map +1 -1
- package/lib/browser/tabbar/renderer.view.d.ts +3 -3
- package/lib/browser/tabbar/renderer.view.d.ts.map +1 -1
- package/lib/browser/tabbar/renderer.view.js +1 -1
- package/lib/browser/tabbar/renderer.view.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/accordion/accordion.view.tsx +18 -7
- package/src/browser/accordion/titlebar.view.tsx +2 -4
- package/src/browser/tabbar/bar.view.tsx +124 -104
- package/src/browser/tabbar/panel.view.tsx +29 -11
- package/src/browser/tabbar/renderer.view.tsx +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accordion.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/accordion.view.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"accordion.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/accordion.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAEvC,OAAO,EAAa,IAAI,EAAiB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAc,MAAM,EAAc,MAAM,2CAA2C,CAAC;AAG3F,OAAO,EAA6C,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAI9F,UAAU,uBAAuB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CAC7B;AAED,eAAO,MAAM,kBAAkB,kDAkF9B,CAAC;AAIF,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC;IAC9D,IAAI,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAA2C,CAAC"}
|
|
@@ -3,14 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Panel = exports.AccordionContainer = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
6
|
-
const react_1 = tslib_1.
|
|
6
|
+
const react_1 = tslib_1.__importStar(require("react"));
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const components_1 = require("@opensumi/ide-core-browser/lib/components");
|
|
9
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
10
|
const accordion_service_1 = require("./accordion.service");
|
|
11
11
|
const section_view_1 = require("./section.view");
|
|
12
|
-
|
|
12
|
+
const constants_1 = require("@opensumi/ide-core-browser/lib/layout/constants");
|
|
13
|
+
exports.AccordionContainer = (0, mobx_react_lite_1.observer)(({ alignment = 'vertical', views, containerId, headerSize, minSize = 120, className, noRestore, style, }) => {
|
|
13
14
|
const accordionService = (0, ide_core_browser_1.useInjectable)(accordion_service_1.AccordionServiceFactory)(containerId, noRestore);
|
|
15
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
16
|
+
const layoutHeaderSize = (0, react_1.useMemo)(() => {
|
|
17
|
+
if (headerSize) {
|
|
18
|
+
return headerSize;
|
|
19
|
+
}
|
|
20
|
+
return appConfig.layoutViewSize ? appConfig.layoutViewSize.ACCORDION_HEADER_SIZE_HEIGHT : constants_1.LAYOUT_VIEW_SIZE.ACCORDION_HEADER_SIZE_HEIGHT;
|
|
21
|
+
}, [headerSize]);
|
|
14
22
|
react_1.default.useEffect(() => {
|
|
15
23
|
// 解决视图在渲染前注册的问题
|
|
16
24
|
if (!views.length) {
|
|
@@ -21,7 +29,7 @@ exports.AccordionContainer = (0, mobx_react_lite_1.observer)(({ alignment = 'ver
|
|
|
21
29
|
}
|
|
22
30
|
}, [views]);
|
|
23
31
|
react_1.default.useEffect(() => {
|
|
24
|
-
accordionService.initConfig({ headerSize, minSize });
|
|
32
|
+
accordionService.initConfig({ headerSize: layoutHeaderSize, minSize });
|
|
25
33
|
}, []);
|
|
26
34
|
const allCollapsed = !accordionService.visibleViews.find((view) => {
|
|
27
35
|
const viewState = accordionService.getViewState(view.id);
|
|
@@ -33,7 +41,7 @@ exports.AccordionContainer = (0, mobx_react_lite_1.observer)(({ alignment = 'ver
|
|
|
33
41
|
const { collapsed, nextSize } = viewState;
|
|
34
42
|
return (react_1.default.createElement(section_view_1.AccordionSection, { noHeader: accordionService.visibleViews.length === 1, onItemClick: () => {
|
|
35
43
|
accordionService.handleSectionClick(view.id, !collapsed, index);
|
|
36
|
-
}, onContextMenuHandler: accordionService.handleContextMenu, alignment: alignment, header: (view.name && (0, ide_core_common_1.replaceLocalizePlaceholder)(view.name)) || view.id, viewId: view.id, key: view.id, expanded: !collapsed, accordionService: accordionService, index: index, headerSize:
|
|
44
|
+
}, onContextMenuHandler: accordionService.handleContextMenu, alignment: alignment, header: (view.name && (0, ide_core_common_1.replaceLocalizePlaceholder)(view.name)) || view.id, viewId: view.id, key: view.id, expanded: !collapsed, accordionService: accordionService, index: index, headerSize: layoutHeaderSize, minSize: layoutHeaderSize, initialProps: view.initialProps, titleMenu: titleMenu, titleMenuContext: view.titleMenuContext, savedSize: collapsed ? layoutHeaderSize : nextSize, flex: view.weight || 1 }, view.component));
|
|
37
45
|
})));
|
|
38
46
|
});
|
|
39
47
|
exports.AccordionContainer.displayName = 'AccordionContainer';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accordion.view.js","sourceRoot":"","sources":["../../../src/browser/accordion/accordion.view.tsx"],"names":[],"mappings":";;;;AAAA,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"accordion.view.js","sourceRoot":"","sources":["../../../src/browser/accordion/accordion.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -24,5 +24,5 @@ export interface CollapsePanelProps extends React.PropsWithChildren<any> {
|
|
|
24
24
|
titleMenu: IMenu | IContextMenu;
|
|
25
25
|
accordionService: AccordionService;
|
|
26
26
|
}
|
|
27
|
-
export declare const AccordionSection: ({ header, description, message, badge, headerClass, onItemClick, noHeader, children, expanded, onResize, size, headerSize, viewId, initialProps, titleMenu, titleMenuContext, accordionService, onContextMenuHandler, alignment, }: CollapsePanelProps) => JSX.Element;
|
|
27
|
+
export declare const AccordionSection: ({ header, description, message, badge, headerClass, onItemClick, noHeader, children, expanded, onResize, size, headerSize, viewId, initialProps, titleMenu, titleMenuContext, accordionService, onContextMenuHandler, alignment, }: CollapsePanelProps) => React.JSX.Element;
|
|
28
28
|
//# sourceMappingURL=section.view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"section.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/section.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,MAAM,EAAgB,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EAAW,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAMxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,MAAM,WAAW,kBAAmB,SAAQ,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC;IAEtE,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,oBAAoB,EAAE,GAAG,CAAC;IAE1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,IAAI,CAAC,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,KAAK,GAAG,YAAY,CAAC;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAMD,eAAO,MAAM,gBAAgB,uOAoB1B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"section.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/section.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,MAAM,EAAgB,MAAM,2CAA2C,CAAC;AAEjF,OAAO,EAAW,KAAK,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAMxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,MAAM,WAAW,kBAAmB,SAAQ,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC;IAEtE,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,WAAW,CAAC,EAAE,GAAG,CAAC;IAClB,oBAAoB,EAAE,GAAG,CAAC;IAE1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,IAAI,CAAC,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,KAAK,GAAG,YAAY,CAAC;IAChC,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAMD,eAAO,MAAM,gBAAgB,uOAoB1B,kBAAkB,sBAiIpB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"titlebar.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/titlebar.view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"titlebar.view.d.ts","sourceRoot":"","sources":["../../../src/browser/accordion/titlebar.view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAKC,CAAC"}
|
|
@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.TitleBar = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const react_1 = tslib_1.__importDefault(require("react"));
|
|
6
|
-
const constants_1 = require("@opensumi/ide-core-browser/lib/layout/constants");
|
|
7
6
|
const styles_module_less_1 = tslib_1.__importDefault(require("./styles.module.less"));
|
|
8
|
-
exports.TitleBar = react_1.default.memo((props) => (react_1.default.createElement("div", { className: styles_module_less_1.default.titlebar, style: { height:
|
|
7
|
+
exports.TitleBar = react_1.default.memo((props) => (react_1.default.createElement("div", { className: styles_module_less_1.default.titlebar, style: { height: props.height } },
|
|
9
8
|
react_1.default.createElement("h1", null, props.title),
|
|
10
9
|
props.menubar || null)));
|
|
11
10
|
exports.TitleBar.displayName = 'TitleBar';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"titlebar.view.js","sourceRoot":"","sources":["../../../src/browser/accordion/titlebar.view.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;
|
|
1
|
+
{"version":3,"file":"titlebar.view.js","sourceRoot":"","sources":["../../../src/browser/accordion/titlebar.view.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,sFAA0C;AAE7B,QAAA,QAAQ,GAIhB,eAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACzB,uCAAK,SAAS,EAAE,4BAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE;IAC9D,0CAAK,KAAK,CAAC,KAAK,CAAM;IACrB,KAAK,CAAC,OAAO,IAAI,IAAI,CAClB,CACP,CAAC,CAAC;AAEH,gBAAQ,CAAC,WAAW,GAAG,UAAU,CAAC"}
|
|
@@ -2,5 +2,5 @@ import React, { PropsWithChildren } from 'react';
|
|
|
2
2
|
import { IInputBaseProps } from '@opensumi/ide-components';
|
|
3
3
|
export declare const AutoFocusedInput: ({ containerId, ...inputProps }: React.PropsWithChildren<{
|
|
4
4
|
containerId: string;
|
|
5
|
-
} & IInputBaseProps>) => JSX.Element;
|
|
5
|
+
} & IInputBaseProps>) => React.JSX.Element;
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/input/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAqB,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAS,MAAM,0BAA0B,CAAC;AAKlE,eAAO,MAAM,gBAAgB;iBAGO,MAAM;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/input/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAqB,MAAM,OAAO,CAAC;AAEpE,OAAO,EAAE,eAAe,EAAS,MAAM,0BAA0B,CAAC;AAKlE,eAAO,MAAM,gBAAgB;iBAGO,MAAM;0CAqBzC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { ComponentRegistryInfo } from '@opensumi/ide-core-browser';
|
|
3
|
+
export declare function splitVisibleTabs(containers: ComponentRegistryInfo[], tabSize: number, availableSize: number): ComponentRegistryInfo[][];
|
|
3
4
|
export interface ITabbarViewProps {
|
|
4
5
|
TabView: React.FC<{
|
|
5
6
|
component: ComponentRegistryInfo;
|
|
@@ -13,6 +14,10 @@ export interface ITabbarViewProps {
|
|
|
13
14
|
className?: string;
|
|
14
15
|
margin?: number;
|
|
15
16
|
canHideTabbar?: boolean;
|
|
17
|
+
renderOtherVisibleContainers?: React.FC<{
|
|
18
|
+
props: ITabbarViewProps;
|
|
19
|
+
renderContainers: (component: ComponentRegistryInfo, handleTabClick: any, currentContainerId: string) => React.JSX.Element | null;
|
|
20
|
+
}>;
|
|
16
21
|
}
|
|
17
22
|
export declare const TabbarViewBase: React.FC<ITabbarViewProps>;
|
|
18
23
|
export declare const IconTabView: React.FC<{
|
|
@@ -24,6 +29,11 @@ export declare const TextTabView: React.FC<{
|
|
|
24
29
|
export declare const IconElipses: React.FC;
|
|
25
30
|
export declare const TextElipses: React.FC;
|
|
26
31
|
export declare const RightTabbarRenderer: React.FC;
|
|
27
|
-
export declare const LeftTabbarRenderer: React.FC
|
|
32
|
+
export declare const LeftTabbarRenderer: React.FC<{
|
|
33
|
+
renderOtherVisibleContainers?: React.FC<{
|
|
34
|
+
props: ITabbarViewProps;
|
|
35
|
+
renderContainers: (component: ComponentRegistryInfo, handleTabClick: any, currentContainerId: string) => React.JSX.Element | null;
|
|
36
|
+
}>;
|
|
37
|
+
}>;
|
|
28
38
|
export declare const BottomTabbarRenderer: React.FC;
|
|
29
39
|
//# sourceMappingURL=bar.view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/bar.view.tsx"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"bar.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/bar.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAG3C,OAAO,EAAE,qBAAqB,EAAoD,MAAM,4BAA4B,CAAC;AAarH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,qBAAqB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,6BAS3G;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QAAE,SAAS,EAAE,qBAAqB,CAAA;KAAE,CAAC,CAAC;IACxD,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,4BAA4B,CAAC,EAAE,KAAK,CAAC,EAAE,CACrC;QACE,KAAK,EAAE,gBAAgB,CAAC;QACxB,gBAAgB,EAAE,CAAC,SAAS,EAAE,qBAAqB,EAAE,cAAc,KAAA,EAAE,kBAAkB,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;KAC7H,CACF,CAAC;CACH;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,gBAAgB,CA8HrD,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,SAAS,EAAE,qBAAqB,CAAA;CAAE,CA+BrE,CAAC;AAEH,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC;IAAE,SAAS,EAAE,qBAAqB,CAAA;CAAE,CASrE,CAAC;AAEH,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAK/B,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAM/B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAmBvC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC;IACxC,4BAA4B,CAAC,EAAE,KAAK,CAAC,EAAE,CACrC;QACE,KAAK,EAAE,gBAAgB,CAAC;QACxB,gBAAgB,EAAE,CAAC,SAAS,EAAE,qBAAqB,EAAE,cAAc,KAAA,EAAE,kBAAkB,EAAE,MAAM,KAAK,KAAK,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;KAC7H,CACF,CAAA;CACF,CA6BA,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAqBxC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BottomTabbarRenderer = exports.LeftTabbarRenderer = exports.RightTabbarRenderer = exports.TextElipses = exports.IconElipses = exports.TextTabView = exports.IconTabView = exports.TabbarViewBase = void 0;
|
|
3
|
+
exports.BottomTabbarRenderer = exports.LeftTabbarRenderer = exports.RightTabbarRenderer = exports.TextElipses = exports.IconElipses = exports.TextTabView = exports.IconTabView = exports.TabbarViewBase = exports.splitVisibleTabs = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
6
6
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
7
|
-
const react_1 = tslib_1.
|
|
7
|
+
const react_1 = tslib_1.__importStar(require("react"));
|
|
8
8
|
const ide_components_1 = require("@opensumi/ide-components");
|
|
9
9
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
10
|
const ide_core_browser_2 = require("@opensumi/ide-core-browser");
|
|
@@ -26,8 +26,10 @@ function splitVisibleTabs(containers, tabSize, availableSize) {
|
|
|
26
26
|
}
|
|
27
27
|
return [containers.slice(0, visibleCount - 1), containers.slice(visibleCount - 1)];
|
|
28
28
|
}
|
|
29
|
-
exports.
|
|
29
|
+
exports.splitVisibleTabs = splitVisibleTabs;
|
|
30
|
+
exports.TabbarViewBase = (0, mobx_react_lite_1.observer)((props) => {
|
|
30
31
|
var _a;
|
|
32
|
+
const { TabView, MoreTabView, forbidCollapse, barSize = 48, panelBorderSize = 0, tabClassName, className, margin, tabSize, canHideTabbar, renderOtherVisibleContainers = () => null, } = props;
|
|
31
33
|
const { side, direction, fullSize } = react_1.default.useContext(renderer_view_1.TabbarConfig);
|
|
32
34
|
const tabbarService = (0, ide_core_browser_1.useInjectable)(tabbar_service_1.TabbarServiceFactory)(side);
|
|
33
35
|
react_1.default.useEffect(() => {
|
|
@@ -48,50 +50,54 @@ exports.TabbarViewBase = (0, mobx_react_lite_1.observer)(({ TabView, MoreTabView
|
|
|
48
50
|
hideContainers.forEach((componentInfo) => {
|
|
49
51
|
tabbarService.updateTabInMoreKey(componentInfo.options.containerId, true);
|
|
50
52
|
});
|
|
53
|
+
const renderContainers = (0, react_1.useCallback)((component, handleTabClick, currentContainerId) => {
|
|
54
|
+
var _a;
|
|
55
|
+
const containerId = (_a = component.options) === null || _a === void 0 ? void 0 : _a.containerId;
|
|
56
|
+
if (!containerId) {
|
|
57
|
+
return null;
|
|
58
|
+
}
|
|
59
|
+
tabbarService.updateTabInMoreKey(containerId, false);
|
|
60
|
+
let ref;
|
|
61
|
+
return (react_1.default.createElement("li", { draggable: true, onDragStart: (e) => {
|
|
62
|
+
if (ref) {
|
|
63
|
+
const dragImage = ref.cloneNode(true);
|
|
64
|
+
dragImage.classList.add(styles_module_less_1.default.dragging);
|
|
65
|
+
if (tabClassName) {
|
|
66
|
+
dragImage.classList.add(tabClassName);
|
|
67
|
+
}
|
|
68
|
+
document.body.appendChild(dragImage);
|
|
69
|
+
e.persist();
|
|
70
|
+
requestAnimationFrame(() => {
|
|
71
|
+
e.dataTransfer.setDragImage(dragImage, 0, 0);
|
|
72
|
+
document.body.removeChild(dragImage);
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
tabbarService.handleDragStart(e, containerId);
|
|
76
|
+
}, onDragOver: (e) => {
|
|
77
|
+
e.preventDefault();
|
|
78
|
+
if (ref) {
|
|
79
|
+
ref.classList.add('on-drag-over');
|
|
80
|
+
}
|
|
81
|
+
}, onDragLeave: () => {
|
|
82
|
+
if (ref) {
|
|
83
|
+
ref.classList.remove('on-drag-over');
|
|
84
|
+
}
|
|
85
|
+
}, onDrop: (e) => {
|
|
86
|
+
if (ref) {
|
|
87
|
+
ref.classList.remove('on-drag-over');
|
|
88
|
+
}
|
|
89
|
+
tabbarService.handleDrop(e, containerId);
|
|
90
|
+
}, key: containerId, id: containerId, onContextMenu: (e) => tabbarService.handleContextMenu(e, containerId),
|
|
91
|
+
// 如果设置了可隐藏 Tabbar，那么就不允许点击 tab 时隐藏整个 panel 了 通过设置 forbidCollapse 来阻止这个动作
|
|
92
|
+
onClick: (e) => handleTabClick(e, willHideTabbar || forbidCollapse), ref: (el) => (ref = el), className: (0, classnames_1.default)({ active: currentContainerId === containerId }, tabClassName) },
|
|
93
|
+
react_1.default.createElement(TabView, { component: component })));
|
|
94
|
+
}, []);
|
|
51
95
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)([styles_module_less_1.default.tab_bar, className]) },
|
|
52
96
|
react_1.default.createElement("div", { className: styles_module_less_1.default.bar_content, style: { flexDirection: layout_1.Layout.getTabbarDirection(direction) } },
|
|
53
97
|
visibleContainers.map((component) => {
|
|
54
|
-
|
|
55
|
-
const containerId = (_a = component.options) === null || _a === void 0 ? void 0 : _a.containerId;
|
|
56
|
-
if (!containerId) {
|
|
57
|
-
return null;
|
|
58
|
-
}
|
|
59
|
-
tabbarService.updateTabInMoreKey(containerId, false);
|
|
60
|
-
let ref;
|
|
61
|
-
return (react_1.default.createElement("li", { draggable: true, onDragStart: (e) => {
|
|
62
|
-
if (ref) {
|
|
63
|
-
const dragImage = ref.cloneNode(true);
|
|
64
|
-
dragImage.classList.add(styles_module_less_1.default.dragging);
|
|
65
|
-
if (tabClassName) {
|
|
66
|
-
dragImage.classList.add(tabClassName);
|
|
67
|
-
}
|
|
68
|
-
document.body.appendChild(dragImage);
|
|
69
|
-
e.persist();
|
|
70
|
-
requestAnimationFrame(() => {
|
|
71
|
-
e.dataTransfer.setDragImage(dragImage, 0, 0);
|
|
72
|
-
document.body.removeChild(dragImage);
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
|
-
tabbarService.handleDragStart(e, containerId);
|
|
76
|
-
}, onDragOver: (e) => {
|
|
77
|
-
e.preventDefault();
|
|
78
|
-
if (ref) {
|
|
79
|
-
ref.classList.add('on-drag-over');
|
|
80
|
-
}
|
|
81
|
-
}, onDragLeave: () => {
|
|
82
|
-
if (ref) {
|
|
83
|
-
ref.classList.remove('on-drag-over');
|
|
84
|
-
}
|
|
85
|
-
}, onDrop: (e) => {
|
|
86
|
-
if (ref) {
|
|
87
|
-
ref.classList.remove('on-drag-over');
|
|
88
|
-
}
|
|
89
|
-
tabbarService.handleDrop(e, containerId);
|
|
90
|
-
}, key: containerId, id: containerId, onContextMenu: (e) => tabbarService.handleContextMenu(e, containerId),
|
|
91
|
-
// 如果设置了可隐藏 Tabbar，那么就不允许点击 tab 时隐藏整个 panel 了 通过设置 forbidCollapse 来阻止这个动作
|
|
92
|
-
onClick: (e) => handleTabClick(e, willHideTabbar || forbidCollapse), ref: (el) => (ref = el), className: (0, classnames_1.default)({ active: currentContainerId === containerId }, tabClassName) },
|
|
93
|
-
react_1.default.createElement(TabView, { component: component })));
|
|
98
|
+
return renderContainers(component, handleTabClick, currentContainerId);
|
|
94
99
|
}),
|
|
100
|
+
renderOtherVisibleContainers({ props, renderContainers }),
|
|
95
101
|
hideContainers.length ? (react_1.default.createElement("li", { key: 'tab-more', onClick: (e) => {
|
|
96
102
|
var _a;
|
|
97
103
|
return tabbarService.showMoreMenu(e, visibleContainers[visibleContainers.length - 1] &&
|
|
@@ -137,7 +143,7 @@ const RightTabbarRenderer = () => {
|
|
|
137
143
|
react_1.default.createElement(exports.TabbarViewBase, { tabSize: 48, MoreTabView: exports.IconElipses, tabClassName: styles_module_less_1.default.right_tab, TabView: exports.IconTabView, barSize: 48, panelBorderSize: 1 })));
|
|
138
144
|
};
|
|
139
145
|
exports.RightTabbarRenderer = RightTabbarRenderer;
|
|
140
|
-
const LeftTabbarRenderer = () => {
|
|
146
|
+
const LeftTabbarRenderer = ({ renderOtherVisibleContainers }) => {
|
|
141
147
|
const { side } = react_1.default.useContext(renderer_view_1.TabbarConfig);
|
|
142
148
|
const layoutService = (0, ide_core_browser_1.useInjectable)(common_1.IMainLayoutService);
|
|
143
149
|
const tabbarService = (0, ide_core_browser_1.useInjectable)(tabbar_service_1.TabbarServiceFactory)(side);
|
|
@@ -145,7 +151,7 @@ const LeftTabbarRenderer = () => {
|
|
|
145
151
|
const extraMenus = react_1.default.useMemo(() => layoutService.getExtraMenu(), [layoutService]);
|
|
146
152
|
return (react_1.default.createElement("div", { id: view_id_1.VIEW_CONTAINERS.LEFT_TABBAR, className: styles_module_less_1.default.left_tab_bar, onContextMenu: tabbarService.handleContextMenu },
|
|
147
153
|
react_1.default.createElement(actions_1.InlineMenuBar, { className: (0, classnames_1.default)(styles_module_less_1.default.vertical_icons, styles_module_less_1.default.extra_top_menus), menus: extraTopMenus }),
|
|
148
|
-
react_1.default.createElement(exports.TabbarViewBase, { tabSize: 48, MoreTabView: exports.IconElipses, className: styles_module_less_1.default.left_tab_content, tabClassName: styles_module_less_1.default.left_tab, TabView: exports.IconTabView, barSize: 48, margin: 90, panelBorderSize: 1 }),
|
|
154
|
+
react_1.default.createElement(exports.TabbarViewBase, { tabSize: 48, MoreTabView: exports.IconElipses, className: styles_module_less_1.default.left_tab_content, tabClassName: styles_module_less_1.default.left_tab, TabView: exports.IconTabView, barSize: 48, margin: 90, panelBorderSize: 1, renderOtherVisibleContainers: renderOtherVisibleContainers }),
|
|
149
155
|
react_1.default.createElement(actions_1.InlineMenuBar, { className: styles_module_less_1.default.vertical_icons, menus: extraMenus })));
|
|
150
156
|
};
|
|
151
157
|
exports.LeftTabbarRenderer = LeftTabbarRenderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bar.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/bar.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA8B;AAC9B,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"bar.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/bar.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA8B;AAC9B,qDAA2C;AAC3C,uDAA2C;AAE3C,6DAAuD;AACvD,iEAAqH;AACrH,iEAAqD;AACrD,+EAAkF;AAClF,oFAAiF;AACjF,2EAAgF;AAChF,sEAA2E;AAE3E,yCAAkD;AAElD,mDAA+C;AAC/C,sFAA0C;AAC1C,qDAAuE;AAEvE,SAAgB,gBAAgB,CAAC,UAAmC,EAAE,OAAe,EAAE,aAAqB;IAC1G,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC;IACzD,IAAI,YAAY,IAAI,UAAU,CAAC,MAAM,EAAE;QACrC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;KACzB;IACD,IAAI,YAAY,IAAI,CAAC,EAAE;QACrB,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;KACzB;IACD,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;AACrF,CAAC;AATD,4CASC;AAwBY,QAAA,cAAc,GAA+B,IAAA,0BAAQ,EAAC,CAAC,KAAK,EAAE,EAAE;;IAC3E,MAAM,EACJ,OAAO,EACP,WAAW,EACX,cAAc,EACd,OAAO,GAAG,EAAE,EACZ,eAAe,GAAG,CAAC,EACnB,YAAY,EACZ,SAAS,EACT,MAAM,EACN,OAAO,EACP,aAAa,EACb,4BAA4B,GAAG,GAAG,EAAE,CAAC,IAAI,GAC1C,GAAG,KAAK,CAAC;IACV,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,eAAK,CAAC,UAAU,CAAC,4BAAY,CAAC,CAAC;IACrE,MAAM,aAAa,GAAkB,IAAA,gCAAa,EAAC,qCAAoB,CAAC,CAAC,IAAI,CAAC,CAAC;IAE/E,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,YAAY;QACZ,aAAa,CAAC,OAAO,GAAG,OAAO,GAAG,eAAe,CAAC;IACpD,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC;IAE7D,MAAM,uBAAuB,GAAG,IAAA,gCAAa,EAAU,uCAAuC,EAAE,KAAK,CAAC,CAAC;IAEvG,MAAM,cAAc,GAAG,aAAa,IAAI,uBAAuB,CAAC;IAEhE,IAAI,cAAc,IAAI,CAAC,kBAAkB,EAAE;QACzC,oBAAoB;QACpB,yCAAyC;QACzC,4DAA4D;QAC5D,sBAAsB;QACtB,MAAA,aAAa,CAAC,YAAY,0CAAE,OAAO,CAAC,CAAC,CAAC,CAAC;KACxC;IAED,MAAM,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,gBAAgB,CAC1D,aAAa,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,WAAC,OAAA,CAAC,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,OAAO,CAAA,CAAA,EAAA,CAAC,EAClF,OAAO,EACP,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CACzB,CAAC;IACF,cAAc,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;QACvC,aAAa,CAAC,kBAAkB,CAAC,aAAa,CAAC,OAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,CAAC,SAAgC,EAAE,cAAwG,EAAE,kBAA0B,EAAE,EAAE;;QAC9M,MAAM,WAAW,GAAG,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,CAAC;QACnD,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,IAAI,CAAC;SACb;QACD,aAAa,CAAC,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,GAAyB,CAAC;QAC9B,OAAO,CACL,sCACE,SAAS,EAAE,IAAI,EACf,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjB,IAAI,GAAG,EAAE;oBACP,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAkB,CAAC;oBACvD,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,4BAAM,CAAC,QAAQ,CAAC,CAAC;oBACzC,IAAI,YAAY,EAAE;wBAChB,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;qBACvC;oBACD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;oBACrC,CAAC,CAAC,OAAO,EAAE,CAAC;oBACZ,qBAAqB,CAAC,GAAG,EAAE;wBACzB,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC7C,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;oBACvC,CAAC,CAAC,CAAC;iBACJ;gBACD,aAAa,CAAC,eAAe,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YAChD,CAAC,EACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;gBAChB,CAAC,CAAC,cAAc,EAAE,CAAC;gBACnB,IAAI,GAAG,EAAE;oBACP,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;iBACnC;YACH,CAAC,EACD,WAAW,EAAE,GAAG,EAAE;gBAChB,IAAI,GAAG,EAAE;oBACP,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;iBACtC;YACH,CAAC,EACD,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;gBACZ,IAAI,GAAG,EAAE;oBACP,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;iBACtC;gBACD,aAAa,CAAC,UAAU,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YAC3C,CAAC,EACD,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,WAAW,EACf,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC,EAAE,WAAW,CAAC;YACrE,yEAAyE;YACzE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,cAAc,IAAI,cAAc,CAAC,EACnE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EACvB,SAAS,EAAE,IAAA,oBAAI,EAAC,EAAE,MAAM,EAAE,kBAAkB,KAAK,WAAW,EAAE,EAAE,YAAY,CAAC;YAE7E,8BAAC,OAAO,IAAC,SAAS,EAAE,SAAS,GAAI,CAC9B,CACN,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,OAAO,CACL,uCAAK,SAAS,EAAE,IAAA,oBAAI,EAAC,CAAC,4BAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC/C,uCAAK,SAAS,EAAE,4BAAM,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,eAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE;YAC/F,iBAAiB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBACnC,OAAO,gBAAgB,CAAC,SAAS,EAAE,cAAc,EAAE,kBAAkB,CAAC,CAAA;YACxE,CAAC,CAAC;YACD,4BAA4B,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;YACzD,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CACvB,sCACE,GAAG,EAAC,UAAU,EACd,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;;oBACb,OAAA,aAAa,CAAC,YAAY,CACxB,CAAC,EACD,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;yBAC/C,MAAA,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,0CAAE,WAAW,CAAA,CACrE,CAAA;iBAAA,EAEH,SAAS,EAAE,YAAY;gBAEvB,8BAAC,WAAW,OAAG,CACZ,CACN,CAAC,CAAC,CAAC,IAAI,CACJ,CACF,CACP,CAAC;AACJ,CAAC,CACA,CAAC;AAEW,QAAA,WAAW,GAAmD,IAAA,0BAAQ,EAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;;IACpG,MAAM,eAAe,GAAqB,IAAA,gCAAa,EAAC,2BAAgB,CAAC,CAAC;IAC1E,MAAM,kBAAkB,GAAuB,IAAA,gCAAa,EAAC,qCAAkB,CAAC,CAAC;IACjF,MAAM,UAAU,GAAG,MAAA,eAAe,CAAC,YAAY,CAAC,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC,0CAAE,aAAa,CAAC,IAAI,CAAC;IAE1G,MAAM,KAAK,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC/B,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QAClC,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,EAAE;YAC/B,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,KAAK,kBAAkB,CAAC,uBAAuB,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,GAAG,CAAC;SAC7G;QACD,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;IACxB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,CACL,uCAAK,SAAS,EAAE,4BAAM,CAAC,QAAQ;QAC7B,uCAAK,SAAS,EAAE,IAAA,oBAAI,EAAC,MAAA,SAAS,CAAC,OAAO,0CAAE,SAAS,EAAE,eAAe,CAAC,EAAE,KAAK,EAAE,KAAK,GAAQ;QACxF,UAAU,CAAC,CAAC,CAAC,CACZ,8BAAC,sBAAK,IAAC,SAAS,EAAE,4BAAM,CAAC,SAAS;YAChC,wCAAM,SAAS,EAAE,4BAAM,CAAC,YAAY;gBAClC,8BAAC,qBAAI,IAAC,IAAI,EAAC,aAAa,GAAG,CACtB,CACD,CACT,CAAC,CAAC,CAAC,CACF,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,KAAK,KAAI,CAC1B,8BAAC,sBAAK,IAAC,SAAS,EAAE,4BAAM,CAAC,SAAS,IAC/B,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CACvE,CACT,CACF,CACG,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEU,QAAA,WAAW,GAAmD,IAAA,0BAAQ,EAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;;IAAC,OAAA,CACrG,uCAAK,SAAS,EAAE,4BAAM,CAAC,QAAQ;QAC7B,uCAAK,SAAS,EAAE,4BAAM,CAAC,gBAAgB,IAAG,MAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,KAAK,0CAAE,WAAW,EAAE,CAAO;QACvF,CAAA,MAAA,SAAS,CAAC,OAAO,0CAAE,KAAK,KAAI,CAC3B,8BAAC,sBAAK,IAAC,SAAS,EAAE,4BAAM,CAAC,SAAS,IAC/B,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CACvE,CACT,CACG,CACP,CAAA;CAAA,CAAC,CAAC;AAEI,MAAM,WAAW,GAAa,GAAG,EAAE,CAAC,CACzC,uCAAK,SAAS,EAAE,4BAAM,CAAC,QAAQ;IAE7B,uCAAK,SAAS,EAAE,IAAA,oBAAI,EAAC,IAAA,0BAAO,EAAC,UAAU,CAAC,EAAE,eAAe,CAAC,EAAE,KAAK,EAAC,YAAY,GAAO,CACjF,CACP,CAAC;AALW,QAAA,WAAW,eAKtB;AAEK,MAAM,WAAW,GAAa,GAAG,EAAE,CAAC,CACzC,uCAAK,SAAS,EAAE,4BAAM,CAAC,QAAQ;IAC7B,uCAAK,SAAS,EAAE,4BAAM,CAAC,gBAAgB;QACrC,qCAAG,SAAS,EAAE,IAAA,0BAAO,EAAC,aAAa,CAAC,GAAM,CACtC,CACF,CACP,CAAC;AANW,QAAA,WAAW,eAMtB;AAEK,MAAM,mBAAmB,GAAa,GAAG,EAAE;IAChD,MAAM,EAAE,IAAI,EAAE,GAAG,eAAK,CAAC,UAAU,CAAC,4BAAY,CAAC,CAAC;IAChD,MAAM,aAAa,GAAkB,IAAA,gCAAa,EAAC,qCAAoB,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/E,OAAO,CACL,uCACE,EAAE,EAAE,yBAAe,CAAC,YAAY,EAChC,SAAS,EAAE,4BAAM,CAAC,aAAa,EAC/B,aAAa,EAAE,aAAa,CAAC,iBAAiB;QAE9C,8BAAC,sBAAc,IACb,OAAO,EAAE,EAAE,EACX,WAAW,EAAE,mBAAW,EACxB,YAAY,EAAE,4BAAM,CAAC,SAAS,EAC9B,OAAO,EAAE,mBAAW,EACpB,OAAO,EAAE,EAAE,EACX,eAAe,EAAE,CAAC,GAClB,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B;AAEK,MAAM,kBAAkB,GAO1B,CAAC,EAAE,4BAA4B,EAAE,EAAE,EAAE;IACxC,MAAM,EAAE,IAAI,EAAE,GAAG,eAAK,CAAC,UAAU,CAAC,4BAAY,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,IAAA,gCAAa,EAAqB,2BAAkB,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAkB,IAAA,gCAAa,EAAC,qCAAoB,CAAC,CAAC,IAAI,CAAC,CAAC;IAE/E,MAAM,aAAa,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,eAAe,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,eAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IAEtF,OAAO,CACL,uCACE,EAAE,EAAE,yBAAe,CAAC,WAAW,EAC/B,SAAS,EAAE,4BAAM,CAAC,YAAY,EAC9B,aAAa,EAAE,aAAa,CAAC,iBAAiB;QAE9C,8BAAC,uBAAa,IAAC,SAAS,EAAE,IAAA,oBAAI,EAAC,4BAAM,CAAC,cAAc,EAAE,4BAAM,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,aAAa,GAAI;QACvG,8BAAC,sBAAc,IACb,OAAO,EAAE,EAAE,EACX,WAAW,EAAE,mBAAW,EACxB,SAAS,EAAE,4BAAM,CAAC,gBAAgB,EAClC,YAAY,EAAE,4BAAM,CAAC,QAAQ,EAC7B,OAAO,EAAE,mBAAW,EACpB,OAAO,EAAE,EAAE,EACX,MAAM,EAAE,EAAE,EACV,eAAe,EAAE,CAAC,EAClB,4BAA4B,EAAE,4BAA4B,GAC1D;QACF,8BAAC,uBAAa,IAAC,SAAS,EAAE,4BAAM,CAAC,cAAc,EAAE,KAAK,EAAE,UAAU,GAAI,CAClE,CACP,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,kBAAkB,sBAoC7B;AAEK,MAAM,oBAAoB,GAAa,GAAG,EAAE;IACjD,MAAM,EAAE,IAAI,EAAE,GAAG,eAAK,CAAC,UAAU,CAAC,4BAAY,CAAC,CAAC;IAChD,MAAM,aAAa,GAAkB,IAAA,gCAAa,EAAC,qCAAoB,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/E,OAAO,CACL,uCACE,EAAE,EAAE,yBAAe,CAAC,aAAa,EACjC,aAAa,EAAE,aAAa,CAAC,iBAAiB,EAC9C,SAAS,EAAE,IAAA,oBAAI,EAAC,4BAAM,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;QAE/D,8BAAC,sBAAc;QACb,2CAA2C;;YAA3C,2CAA2C;YAC3C,OAAO,EAAE,EAAE,EACX,WAAW,EAAE,mBAAW,EACxB,YAAY,EAAE,4BAAM,CAAC,UAAU,EAC/B,OAAO,EAAE,mBAAW,EACpB,OAAO,EAAE,EAAE,EACX,eAAe,EAAE,CAAC,EAClB,aAAa,SACb,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,oBAAoB,wBAqB/B"}
|
|
@@ -9,8 +9,14 @@ export interface IBaseTabPanelView {
|
|
|
9
9
|
}>;
|
|
10
10
|
id?: string;
|
|
11
11
|
panelSize?: number;
|
|
12
|
+
currentContainerId?: string;
|
|
12
13
|
}
|
|
13
14
|
export declare const BaseTabPanelView: React.FC<IBaseTabPanelView>;
|
|
15
|
+
export declare const ContainerView: React.FC<{
|
|
16
|
+
component: ComponentRegistryInfo;
|
|
17
|
+
side: string;
|
|
18
|
+
titleMenu: IMenu;
|
|
19
|
+
}>;
|
|
14
20
|
export declare const RightTabPanelRenderer: React.FC;
|
|
15
21
|
export declare const LeftTabPanelRenderer: React.FC;
|
|
16
22
|
export declare const BottomTabPanelRenderer: React.FC;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panel.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"panel.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAkB,MAAM,OAAO,CAAC;AAGvC,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;IACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAgDvD,CAAC;AAEH,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC;IACnC,SAAS,EAAE,qBAAqB,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,KAAK,CAAC;CAClB,CA4DC,CAAC;AAiEH,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,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.BottomTabPanelRenderer = exports.LeftTabPanelRenderer = exports.RightTabPanelRenderer = exports.BaseTabPanelView = void 0;
|
|
3
|
+
exports.BottomTabPanelRenderer = exports.LeftTabPanelRenderer = exports.RightTabPanelRenderer = exports.ContainerView = exports.BaseTabPanelView = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const classnames_1 = tslib_1.__importDefault(require("classnames"));
|
|
6
6
|
const mobx_react_lite_1 = require("mobx-react-lite");
|
|
7
|
-
const react_1 = tslib_1.
|
|
7
|
+
const react_1 = tslib_1.__importStar(require("react"));
|
|
8
8
|
const di_1 = require("@opensumi/di");
|
|
9
9
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
10
|
const actions_1 = require("@opensumi/ide-core-browser/lib/components/actions");
|
|
@@ -20,12 +20,13 @@ const tabbar_service_1 = require("./tabbar.service");
|
|
|
20
20
|
const NoUpdateBoundary = react_1.default.memo(({ children }) => children, (prev, next) => !(prev.visible || next.visible));
|
|
21
21
|
const panelVisible = { zIndex: 1, display: 'block' };
|
|
22
22
|
const panelInVisible = { zIndex: -1, display: 'none' };
|
|
23
|
-
exports.BaseTabPanelView = (0, mobx_react_lite_1.observer)((
|
|
23
|
+
exports.BaseTabPanelView = (0, mobx_react_lite_1.observer)((props) => {
|
|
24
|
+
const { PanelView, panelSize, id } = props;
|
|
24
25
|
const { side } = react_1.default.useContext(renderer_view_1.TabbarConfig);
|
|
25
26
|
const tabbarService = (0, ide_core_browser_1.useInjectable)(tabbar_service_1.TabbarServiceFactory)(side);
|
|
26
27
|
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
27
28
|
const customPanelSize = appConfig.panelSizes && appConfig.panelSizes[side];
|
|
28
|
-
const
|
|
29
|
+
const currentContainerId = (0, react_1.useMemo)(() => props.currentContainerId || tabbarService.currentContainerId, [props.currentContainerId, tabbarService.currentContainerId]);
|
|
29
30
|
react_1.default.useEffect(() => {
|
|
30
31
|
// panelSize = 384-1-48
|
|
31
32
|
tabbarService.panelSize = customPanelSize || panelSize || 335;
|
|
@@ -45,11 +46,11 @@ exports.BaseTabPanelView = (0, mobx_react_lite_1.observer)(({ PanelView, panelSi
|
|
|
45
46
|
react_1.default.createElement(PanelView, { titleMenu: titleMenu, side: side, component: component })))));
|
|
46
47
|
})));
|
|
47
48
|
});
|
|
48
|
-
|
|
49
|
+
exports.ContainerView = (0, mobx_react_lite_1.observer)(({ component, titleMenu, side }) => {
|
|
49
50
|
var _a, _b;
|
|
50
51
|
const ref = react_1.default.useRef();
|
|
51
52
|
const containerRef = react_1.default.useRef(null);
|
|
52
|
-
const
|
|
53
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
53
54
|
const { title, titleComponent, component: CustomComponent, containerId } = component.options || {};
|
|
54
55
|
const injector = (0, ide_core_browser_1.useInjectable)(di_1.INJECTOR_TOKEN);
|
|
55
56
|
const handleContextMenu = (e) => {
|
|
@@ -65,22 +66,23 @@ const ContainerView = (0, mobx_react_lite_1.observer)(({ component, titleMenu, s
|
|
|
65
66
|
return null;
|
|
66
67
|
}
|
|
67
68
|
const viewState = (0, ide_core_browser_1.useViewState)(side, containerRef);
|
|
69
|
+
const PANEL_TITLEBAR_HEIGHT = react_1.default.useMemo(() => { var _a; return ((_a = appConfig.layoutViewSize) === null || _a === void 0 ? void 0 : _a.PANEL_TITLEBAR_HEIGHT) || constants_1.LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT; }, [appConfig]);
|
|
68
70
|
return (react_1.default.createElement("div", { ref: containerRef, className: styles_module_less_1.default.view_container },
|
|
69
71
|
!CustomComponent && (react_1.default.createElement("div", { onContextMenu: handleContextMenu, className: styles_module_less_1.default.panel_titlebar },
|
|
70
|
-
!title ? null : react_1.default.createElement(titlebar_view_1.TitleBar, { title: title, menubar: react_1.default.createElement(actions_1.InlineActionBar, { menus: titleMenu }) }),
|
|
72
|
+
!title ? null : (react_1.default.createElement(titlebar_view_1.TitleBar, { title: title, height: PANEL_TITLEBAR_HEIGHT, menubar: react_1.default.createElement(actions_1.InlineActionBar, { menus: titleMenu }) })),
|
|
71
73
|
titleComponent && (react_1.default.createElement("div", { className: styles_module_less_1.default.panel_component },
|
|
72
|
-
react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value:
|
|
74
|
+
react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value: appConfig },
|
|
73
75
|
react_1.default.createElement(ide_core_browser_1.ComponentRenderer, { Component: titleComponent, initialProps: (_a = component.options) === null || _a === void 0 ? void 0 : _a.titleProps })))))),
|
|
74
76
|
react_1.default.createElement("div", { className: styles_module_less_1.default.container_wrap, ref: (ele) => (ref.current = ele) },
|
|
75
77
|
react_1.default.createElement(progress_bar_1.ProgressBar, { progressModel: indicator.progressModel }),
|
|
76
|
-
CustomComponent ? (react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value:
|
|
78
|
+
CustomComponent ? (react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value: appConfig },
|
|
77
79
|
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
80
|
});
|
|
79
81
|
const BottomPanelView = (0, mobx_react_lite_1.observer)(({ component, titleMenu, side }) => {
|
|
80
82
|
var _a, _b, _c, _d;
|
|
81
83
|
const ref = react_1.default.useRef();
|
|
82
84
|
const containerRef = react_1.default.useRef(null);
|
|
83
|
-
const
|
|
85
|
+
const appConfig = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AppConfig);
|
|
84
86
|
const tabbarService = (0, ide_core_browser_1.useInjectable)(tabbar_service_1.TabbarServiceFactory)(side);
|
|
85
87
|
const { component: CustomComponent, containerId } = component.options || {};
|
|
86
88
|
const titleComponent = component.options && component.options.titleComponent;
|
|
@@ -93,8 +95,9 @@ const BottomPanelView = (0, mobx_react_lite_1.observer)(({ component, titleMenu,
|
|
|
93
95
|
return null;
|
|
94
96
|
}
|
|
95
97
|
const viewState = (0, ide_core_browser_1.useViewState)(side, containerRef);
|
|
98
|
+
const PANEL_TITLEBAR_HEIGHT = react_1.default.useMemo(() => { var _a; return ((_a = appConfig.layoutViewSize) === null || _a === void 0 ? void 0 : _a.PANEL_TITLEBAR_HEIGHT) || constants_1.LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT; }, [appConfig]);
|
|
96
99
|
return (react_1.default.createElement("div", { ref: containerRef, className: styles_module_less_1.default.panel_container },
|
|
97
|
-
react_1.default.createElement("div", { className: styles_module_less_1.default.panel_title_bar, style: { height:
|
|
100
|
+
react_1.default.createElement("div", { className: styles_module_less_1.default.panel_title_bar, style: { height: PANEL_TITLEBAR_HEIGHT } },
|
|
98
101
|
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()),
|
|
99
102
|
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 }))),
|
|
100
103
|
react_1.default.createElement("div", { className: styles_module_less_1.default.panel_toolbar_container },
|
|
@@ -102,12 +105,12 @@ const BottomPanelView = (0, mobx_react_lite_1.observer)(({ component, titleMenu,
|
|
|
102
105
|
react_1.default.createElement(actions_1.InlineMenuBar, { menus: tabbarService.commonTitleMenu, moreAtFirst: true }))),
|
|
103
106
|
react_1.default.createElement("div", { className: styles_module_less_1.default.container_wrap, ref: (ele) => (ref.current = ele) },
|
|
104
107
|
react_1.default.createElement(progress_bar_1.ProgressBar, { progressModel: indicator.progressModel }),
|
|
105
|
-
CustomComponent ? (react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value:
|
|
108
|
+
CustomComponent ? (react_1.default.createElement(ide_core_browser_1.ConfigProvider, { value: appConfig },
|
|
106
109
|
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, alignment: 'horizontal', minSize: component.options.miniSize, containerId: component.options.containerId })))));
|
|
107
110
|
});
|
|
108
|
-
const RightTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: ContainerView });
|
|
111
|
+
const RightTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: exports.ContainerView });
|
|
109
112
|
exports.RightTabPanelRenderer = RightTabPanelRenderer;
|
|
110
|
-
const LeftTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: ContainerView });
|
|
113
|
+
const LeftTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: exports.ContainerView });
|
|
111
114
|
exports.LeftTabPanelRenderer = LeftTabPanelRenderer;
|
|
112
115
|
const BottomTabPanelRenderer = () => react_1.default.createElement(exports.BaseTabPanelView, { PanelView: BottomPanelView, panelSize: 280 });
|
|
113
116
|
exports.BottomTabPanelRenderer = BottomTabPanelRenderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"panel.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":";;;;AAAA,oEAA8B;AAC9B,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"panel.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/panel.view.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,13 +19,13 @@ export declare const TabRendererBase: React.FC<{
|
|
|
19
19
|
export declare const RightTabRenderer: ({ className, components, }: {
|
|
20
20
|
className: string;
|
|
21
21
|
components: ComponentRegistryInfo[];
|
|
22
|
-
}) => JSX.Element;
|
|
22
|
+
}) => React.JSX.Element;
|
|
23
23
|
export declare const LeftTabRenderer: ({ className, components, }: {
|
|
24
24
|
className: string;
|
|
25
25
|
components: ComponentRegistryInfo[];
|
|
26
|
-
}) => JSX.Element;
|
|
26
|
+
}) => React.JSX.Element;
|
|
27
27
|
export declare const BottomTabRenderer: ({ className, components, }: {
|
|
28
28
|
className: string;
|
|
29
29
|
components: ComponentRegistryInfo[];
|
|
30
|
-
}) => JSX.Element;
|
|
30
|
+
}) => React.JSX.Element;
|
|
31
31
|
//# sourceMappingURL=renderer.view.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/renderer.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,qBAAqB,EAAyC,MAAM,4BAA4B,CAAC;AAE1G,OAAO,EAAE,MAAM,EAAE,MAAM,yDAAyD,CAAC;AAQjF,eAAO,MAAM,YAAY;UACjB,MAAM;eACD,OAAO,SAAS;cACjB,MAAM;EAKhB,CAAC;AAEH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;IACrB,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAEvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CA4CA,CAAC;AAEF,eAAO,MAAM,gBAAgB;eAIhB,MAAM;gBACL,qBAAqB,EAAE;
|
|
1
|
+
{"version":3,"file":"renderer.view.d.ts","sourceRoot":"","sources":["../../../src/browser/tabbar/renderer.view.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,qBAAqB,EAAyC,MAAM,4BAA4B,CAAC;AAE1G,OAAO,EAAE,MAAM,EAAE,MAAM,yDAAyD,CAAC;AAQjF,eAAO,MAAM,YAAY;UACjB,MAAM;eACD,OAAO,SAAS;cACjB,MAAM;EAKhB,CAAC;AAEH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;IACrB,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;IAEvB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CA4CA,CAAC;AAEF,eAAO,MAAM,gBAAgB;eAIhB,MAAM;gBACL,qBAAqB,EAAE;uBAWpC,CAAC;AAEF,eAAO,MAAM,eAAe;eAIf,MAAM;gBACL,qBAAqB,EAAE;uBAWpC,CAAC;AAEF,eAAO,MAAM,iBAAiB;eAIjB,MAAM;gBACL,qBAAqB,EAAE;uBAYpC,CAAC"}
|
|
@@ -53,7 +53,7 @@ const TabRendererBase = ({ id, className, components, direction = 'left-to-right
|
|
|
53
53
|
react_1.default.createElement(TabpanelView, null))));
|
|
54
54
|
};
|
|
55
55
|
exports.TabRendererBase = TabRendererBase;
|
|
56
|
-
const RightTabRenderer = ({ className, components, }) => (react_1.default.createElement(exports.TabRendererBase, { side: 'right', direction: 'right-to-left', id: view_id_1.VIEW_CONTAINERS.
|
|
56
|
+
const RightTabRenderer = ({ className, components, }) => (react_1.default.createElement(exports.TabRendererBase, { side: 'right', direction: 'right-to-left', id: view_id_1.VIEW_CONTAINERS.RIGHT_TABBAR_PANEL, className: (0, classnames_1.default)(className, 'right-slot'), components: components, TabbarView: bar_view_1.RightTabbarRenderer, TabpanelView: panel_view_1.RightTabPanelRenderer }));
|
|
57
57
|
exports.RightTabRenderer = RightTabRenderer;
|
|
58
58
|
const LeftTabRenderer = ({ className, components, }) => (react_1.default.createElement(exports.TabRendererBase, { side: 'left', direction: 'left-to-right', id: view_id_1.VIEW_CONTAINERS.LEFT_TABBAR_PANEL, className: (0, classnames_1.default)(className, 'left-slot'), components: components, TabbarView: bar_view_1.LeftTabbarRenderer, TabpanelView: panel_view_1.LeftTabPanelRenderer }));
|
|
59
59
|
exports.LeftTabRenderer = LeftTabRenderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/renderer.view.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"renderer.view.js","sourceRoot":"","sources":["../../../src/browser/tabbar/renderer.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.26.
|
|
3
|
+
"version": "2.26.9-rc-1695060705.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.26.
|
|
22
|
-
"@opensumi/ide-core-common": "2.26.
|
|
21
|
+
"@opensumi/ide-components": "2.26.9-rc-1695060705.0",
|
|
22
|
+
"@opensumi/ide-core-common": "2.26.9-rc-1695060705.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-core-browser": "2.26.
|
|
25
|
+
"@opensumi/ide-core-browser": "2.26.9-rc-1695060705.0",
|
|
26
26
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
27
|
-
"@opensumi/ide-theme": "2.26.
|
|
27
|
+
"@opensumi/ide-theme": "2.26.9-rc-1695060705.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "727aca70b9cfad7c49648e93896f0866a788dad4"
|
|
30
30
|
}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { observer } from 'mobx-react-lite';
|
|
2
|
-
import React from 'react';
|
|
2
|
+
import React, { useMemo } from 'react';
|
|
3
3
|
|
|
4
|
-
import { View, useInjectable } from '@opensumi/ide-core-browser';
|
|
4
|
+
import { AppConfig, View, useInjectable } from '@opensumi/ide-core-browser';
|
|
5
5
|
import { EDirection, Layout, SplitPanel } from '@opensumi/ide-core-browser/lib/components';
|
|
6
6
|
import { replaceLocalizePlaceholder } from '@opensumi/ide-core-common';
|
|
7
7
|
|
|
8
8
|
import { AccordionServiceFactory, AccordionService, SectionState } from './accordion.service';
|
|
9
9
|
import { AccordionSection } from './section.view';
|
|
10
|
+
import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
|
|
10
11
|
|
|
11
12
|
interface AccordionContainerProps {
|
|
12
13
|
alignment?: Layout.alignment;
|
|
@@ -25,13 +26,23 @@ export const AccordionContainer = observer(
|
|
|
25
26
|
alignment = 'vertical',
|
|
26
27
|
views,
|
|
27
28
|
containerId,
|
|
28
|
-
headerSize
|
|
29
|
+
headerSize,
|
|
29
30
|
minSize = 120,
|
|
30
31
|
className,
|
|
31
32
|
noRestore,
|
|
32
33
|
style,
|
|
33
34
|
}: AccordionContainerProps) => {
|
|
34
35
|
const accordionService: AccordionService = useInjectable(AccordionServiceFactory)(containerId, noRestore);
|
|
36
|
+
const appConfig: AppConfig = useInjectable(AppConfig);
|
|
37
|
+
|
|
38
|
+
const layoutHeaderSize = useMemo(() => {
|
|
39
|
+
if (headerSize) {
|
|
40
|
+
return headerSize;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
return appConfig.layoutViewSize ? appConfig.layoutViewSize.ACCORDION_HEADER_SIZE_HEIGHT : LAYOUT_VIEW_SIZE.ACCORDION_HEADER_SIZE_HEIGHT;
|
|
44
|
+
}, [headerSize])
|
|
45
|
+
|
|
35
46
|
React.useEffect(() => {
|
|
36
47
|
// 解决视图在渲染前注册的问题
|
|
37
48
|
if (!views.length) {
|
|
@@ -42,7 +53,7 @@ export const AccordionContainer = observer(
|
|
|
42
53
|
}
|
|
43
54
|
}, [views]);
|
|
44
55
|
React.useEffect(() => {
|
|
45
|
-
accordionService.initConfig({ headerSize, minSize });
|
|
56
|
+
accordionService.initConfig({ headerSize: layoutHeaderSize, minSize });
|
|
46
57
|
}, []);
|
|
47
58
|
const allCollapsed = !accordionService.visibleViews.find((view) => {
|
|
48
59
|
const viewState: SectionState = accordionService.getViewState(view.id);
|
|
@@ -77,12 +88,12 @@ export const AccordionContainer = observer(
|
|
|
77
88
|
expanded={!collapsed}
|
|
78
89
|
accordionService={accordionService}
|
|
79
90
|
index={index}
|
|
80
|
-
headerSize={
|
|
81
|
-
minSize={
|
|
91
|
+
headerSize={layoutHeaderSize}
|
|
92
|
+
minSize={layoutHeaderSize}
|
|
82
93
|
initialProps={view.initialProps}
|
|
83
94
|
titleMenu={titleMenu}
|
|
84
95
|
titleMenuContext={view.titleMenuContext}
|
|
85
|
-
savedSize={collapsed ?
|
|
96
|
+
savedSize={collapsed ? layoutHeaderSize : nextSize}
|
|
86
97
|
flex={view.weight || 1}
|
|
87
98
|
>
|
|
88
99
|
{view.component}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
3
|
-
import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
|
|
4
|
-
|
|
5
2
|
import styles from './styles.module.less';
|
|
6
3
|
|
|
7
4
|
export const TitleBar: React.FC<{
|
|
8
5
|
title: string;
|
|
9
6
|
menubar?: React.ReactNode;
|
|
7
|
+
height?: number;
|
|
10
8
|
}> = React.memo((props) => (
|
|
11
|
-
<div className={styles.titlebar} style={{ height:
|
|
9
|
+
<div className={styles.titlebar} style={{ height: props.height }}>
|
|
12
10
|
<h1>{props.title}</h1>
|
|
13
11
|
{props.menubar || null}
|
|
14
12
|
</div>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import clsx from 'classnames';
|
|
2
2
|
import { observer } from 'mobx-react-lite';
|
|
3
|
-
import React from 'react';
|
|
3
|
+
import React, { useCallback } from 'react';
|
|
4
4
|
|
|
5
5
|
import { Badge, Icon } from '@opensumi/ide-components';
|
|
6
6
|
import { ComponentRegistryInfo, useInjectable, KeybindingRegistry, usePreference } from '@opensumi/ide-core-browser';
|
|
@@ -16,7 +16,7 @@ import { TabbarConfig } from './renderer.view';
|
|
|
16
16
|
import styles from './styles.module.less';
|
|
17
17
|
import { TabbarService, TabbarServiceFactory } from './tabbar.service';
|
|
18
18
|
|
|
19
|
-
function splitVisibleTabs(containers: ComponentRegistryInfo[], tabSize: number, availableSize: number) {
|
|
19
|
+
export function splitVisibleTabs(containers: ComponentRegistryInfo[], tabSize: number, availableSize: number) {
|
|
20
20
|
const visibleCount = Math.floor(availableSize / tabSize);
|
|
21
21
|
if (visibleCount >= containers.length) {
|
|
22
22
|
return [containers, []];
|
|
@@ -41,10 +41,16 @@ export interface ITabbarViewProps {
|
|
|
41
41
|
// tab上预留的位置，用来控制tab过多的显示效果
|
|
42
42
|
margin?: number;
|
|
43
43
|
canHideTabbar?: boolean;
|
|
44
|
+
renderOtherVisibleContainers?: React.FC<
|
|
45
|
+
{
|
|
46
|
+
props: ITabbarViewProps,
|
|
47
|
+
renderContainers: (component: ComponentRegistryInfo, handleTabClick, currentContainerId: string) => React.JSX.Element | null
|
|
48
|
+
}
|
|
49
|
+
>;
|
|
44
50
|
}
|
|
45
51
|
|
|
46
|
-
export const TabbarViewBase: React.FC<ITabbarViewProps> = observer(
|
|
47
|
-
|
|
52
|
+
export const TabbarViewBase: React.FC<ITabbarViewProps> = observer((props) => {
|
|
53
|
+
const {
|
|
48
54
|
TabView,
|
|
49
55
|
MoreTabView,
|
|
50
56
|
forbidCollapse,
|
|
@@ -55,114 +61,120 @@ export const TabbarViewBase: React.FC<ITabbarViewProps> = observer(
|
|
|
55
61
|
margin,
|
|
56
62
|
tabSize,
|
|
57
63
|
canHideTabbar,
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
64
|
+
renderOtherVisibleContainers = () => null,
|
|
65
|
+
} = props;
|
|
66
|
+
const { side, direction, fullSize } = React.useContext(TabbarConfig);
|
|
67
|
+
const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
|
|
61
68
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
69
|
+
React.useEffect(() => {
|
|
70
|
+
// 内部只关注总的宽度
|
|
71
|
+
tabbarService.barSize = barSize + panelBorderSize;
|
|
72
|
+
}, []);
|
|
73
|
+
const { currentContainerId, handleTabClick } = tabbarService;
|
|
67
74
|
|
|
68
|
-
|
|
75
|
+
const hideTabBarWhenHidePanel = usePreference<boolean>('workbench.hideSlotTabBarWhenHidePanel', false);
|
|
69
76
|
|
|
70
|
-
|
|
77
|
+
const willHideTabbar = canHideTabbar && hideTabBarWhenHidePanel;
|
|
71
78
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
if (willHideTabbar && !currentContainerId) {
|
|
80
|
+
// 之所以要用这么偏门的方法，是因为：
|
|
81
|
+
// 我尝试了好几种方案，比如让 tabbar 或其他几个组件返回 null 的话
|
|
82
|
+
// 会导致 SplitPanel 计算 children 的尺寸不正确，或者计算 tabbar 上按钮区域长度不对等等
|
|
83
|
+
// 最后试了这个方法一劳永逸，感觉也挺合适
|
|
84
|
+
tabbarService.resizeHandle?.setSize(0);
|
|
85
|
+
}
|
|
79
86
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
87
|
+
const [visibleContainers, hideContainers] = splitVisibleTabs(
|
|
88
|
+
tabbarService.visibleContainers.filter((container) => !container.options?.hideTab),
|
|
89
|
+
tabSize,
|
|
90
|
+
fullSize - (margin || 0),
|
|
91
|
+
);
|
|
92
|
+
hideContainers.forEach((componentInfo) => {
|
|
93
|
+
tabbarService.updateTabInMoreKey(componentInfo.options!.containerId, true);
|
|
94
|
+
});
|
|
88
95
|
|
|
96
|
+
const renderContainers = useCallback((component: ComponentRegistryInfo, handleTabClick: (e: React.MouseEvent<Element, MouseEvent>, forbidCollapse?: boolean | undefined) => void, currentContainerId: string) => {
|
|
97
|
+
const containerId = component.options?.containerId;
|
|
98
|
+
if (!containerId) {
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
tabbarService.updateTabInMoreKey(containerId, false);
|
|
102
|
+
let ref: HTMLLIElement | null;
|
|
89
103
|
return (
|
|
90
|
-
<
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
104
|
+
<li
|
|
105
|
+
draggable={true}
|
|
106
|
+
onDragStart={(e) => {
|
|
107
|
+
if (ref) {
|
|
108
|
+
const dragImage = ref.cloneNode(true) as HTMLLIElement;
|
|
109
|
+
dragImage.classList.add(styles.dragging);
|
|
110
|
+
if (tabClassName) {
|
|
111
|
+
dragImage.classList.add(tabClassName);
|
|
96
112
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
tabbarService.handleDrop(e, containerId);
|
|
134
|
-
}}
|
|
135
|
-
key={containerId}
|
|
136
|
-
id={containerId}
|
|
137
|
-
onContextMenu={(e) => tabbarService.handleContextMenu(e, containerId)}
|
|
138
|
-
// 如果设置了可隐藏 Tabbar，那么就不允许点击 tab 时隐藏整个 panel 了 通过设置 forbidCollapse 来阻止这个动作
|
|
139
|
-
onClick={(e) => handleTabClick(e, willHideTabbar || forbidCollapse)}
|
|
140
|
-
ref={(el) => (ref = el)}
|
|
141
|
-
className={clsx({ active: currentContainerId === containerId }, tabClassName)}
|
|
142
|
-
>
|
|
143
|
-
<TabView component={component} />
|
|
144
|
-
</li>
|
|
145
|
-
);
|
|
146
|
-
})}
|
|
147
|
-
{hideContainers.length ? (
|
|
148
|
-
<li
|
|
149
|
-
key='tab-more'
|
|
150
|
-
onClick={(e) =>
|
|
151
|
-
tabbarService.showMoreMenu(
|
|
152
|
-
e,
|
|
153
|
-
visibleContainers[visibleContainers.length - 1] &&
|
|
154
|
-
visibleContainers[visibleContainers.length - 1].options?.containerId,
|
|
155
|
-
)
|
|
156
|
-
}
|
|
157
|
-
className={tabClassName}
|
|
158
|
-
>
|
|
159
|
-
<MoreTabView />
|
|
160
|
-
</li>
|
|
161
|
-
) : null}
|
|
162
|
-
</div>
|
|
163
|
-
</div>
|
|
113
|
+
document.body.appendChild(dragImage);
|
|
114
|
+
e.persist();
|
|
115
|
+
requestAnimationFrame(() => {
|
|
116
|
+
e.dataTransfer.setDragImage(dragImage, 0, 0);
|
|
117
|
+
document.body.removeChild(dragImage);
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
tabbarService.handleDragStart(e, containerId);
|
|
121
|
+
}}
|
|
122
|
+
onDragOver={(e) => {
|
|
123
|
+
e.preventDefault();
|
|
124
|
+
if (ref) {
|
|
125
|
+
ref.classList.add('on-drag-over');
|
|
126
|
+
}
|
|
127
|
+
}}
|
|
128
|
+
onDragLeave={() => {
|
|
129
|
+
if (ref) {
|
|
130
|
+
ref.classList.remove('on-drag-over');
|
|
131
|
+
}
|
|
132
|
+
}}
|
|
133
|
+
onDrop={(e) => {
|
|
134
|
+
if (ref) {
|
|
135
|
+
ref.classList.remove('on-drag-over');
|
|
136
|
+
}
|
|
137
|
+
tabbarService.handleDrop(e, containerId);
|
|
138
|
+
}}
|
|
139
|
+
key={containerId}
|
|
140
|
+
id={containerId}
|
|
141
|
+
onContextMenu={(e) => tabbarService.handleContextMenu(e, containerId)}
|
|
142
|
+
// 如果设置了可隐藏 Tabbar，那么就不允许点击 tab 时隐藏整个 panel 了 通过设置 forbidCollapse 来阻止这个动作
|
|
143
|
+
onClick={(e) => handleTabClick(e, willHideTabbar || forbidCollapse)}
|
|
144
|
+
ref={(el) => (ref = el)}
|
|
145
|
+
className={clsx({ active: currentContainerId === containerId }, tabClassName)}
|
|
146
|
+
>
|
|
147
|
+
<TabView component={component} />
|
|
148
|
+
</li>
|
|
164
149
|
);
|
|
165
|
-
},
|
|
150
|
+
}, [])
|
|
151
|
+
|
|
152
|
+
return (
|
|
153
|
+
<div className={clsx([styles.tab_bar, className])}>
|
|
154
|
+
<div className={styles.bar_content} style={{ flexDirection: Layout.getTabbarDirection(direction) }}>
|
|
155
|
+
{visibleContainers.map((component) => {
|
|
156
|
+
return renderContainers(component, handleTabClick, currentContainerId)
|
|
157
|
+
})}
|
|
158
|
+
{renderOtherVisibleContainers({ props, renderContainers })}
|
|
159
|
+
{hideContainers.length ? (
|
|
160
|
+
<li
|
|
161
|
+
key='tab-more'
|
|
162
|
+
onClick={(e) =>
|
|
163
|
+
tabbarService.showMoreMenu(
|
|
164
|
+
e,
|
|
165
|
+
visibleContainers[visibleContainers.length - 1] &&
|
|
166
|
+
visibleContainers[visibleContainers.length - 1].options?.containerId,
|
|
167
|
+
)
|
|
168
|
+
}
|
|
169
|
+
className={tabClassName}
|
|
170
|
+
>
|
|
171
|
+
<MoreTabView />
|
|
172
|
+
</li>
|
|
173
|
+
) : null}
|
|
174
|
+
</div>
|
|
175
|
+
</div>
|
|
176
|
+
);
|
|
177
|
+
},
|
|
166
178
|
);
|
|
167
179
|
|
|
168
180
|
export const IconTabView: React.FC<{ component: ComponentRegistryInfo }> = observer(({ component }) => {
|
|
@@ -245,7 +257,14 @@ export const RightTabbarRenderer: React.FC = () => {
|
|
|
245
257
|
);
|
|
246
258
|
};
|
|
247
259
|
|
|
248
|
-
export const LeftTabbarRenderer: React.FC
|
|
260
|
+
export const LeftTabbarRenderer: React.FC<{
|
|
261
|
+
renderOtherVisibleContainers?: React.FC<
|
|
262
|
+
{
|
|
263
|
+
props: ITabbarViewProps,
|
|
264
|
+
renderContainers: (component: ComponentRegistryInfo, handleTabClick, currentContainerId: string) => React.JSX.Element | null
|
|
265
|
+
}
|
|
266
|
+
>
|
|
267
|
+
}> = ({ renderOtherVisibleContainers }) => {
|
|
249
268
|
const { side } = React.useContext(TabbarConfig);
|
|
250
269
|
const layoutService = useInjectable<IMainLayoutService>(IMainLayoutService);
|
|
251
270
|
const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
|
|
@@ -269,6 +288,7 @@ export const LeftTabbarRenderer: React.FC = () => {
|
|
|
269
288
|
barSize={48}
|
|
270
289
|
margin={90}
|
|
271
290
|
panelBorderSize={1}
|
|
291
|
+
renderOtherVisibleContainers={renderOtherVisibleContainers}
|
|
272
292
|
/>
|
|
273
293
|
<InlineMenuBar className={styles.vertical_icons} menus={extraMenus} />
|
|
274
294
|
</div>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import clsx from 'classnames';
|
|
2
2
|
import { observer } from 'mobx-react-lite';
|
|
3
|
-
import React from 'react';
|
|
3
|
+
import React, { useMemo } from 'react';
|
|
4
4
|
|
|
5
5
|
import { INJECTOR_TOKEN, Injector } from '@opensumi/di';
|
|
6
6
|
import {
|
|
@@ -39,14 +39,20 @@ export interface IBaseTabPanelView {
|
|
|
39
39
|
// tabPanel的尺寸（横向为宽，纵向高）
|
|
40
40
|
id?: string;
|
|
41
41
|
panelSize?: number;
|
|
42
|
+
currentContainerId?: string;
|
|
42
43
|
}
|
|
43
44
|
|
|
44
|
-
export const BaseTabPanelView: React.FC<IBaseTabPanelView> = observer((
|
|
45
|
+
export const BaseTabPanelView: React.FC<IBaseTabPanelView> = observer((props) => {
|
|
46
|
+
const { PanelView, panelSize, id } = props;
|
|
45
47
|
const { side } = React.useContext(TabbarConfig);
|
|
46
48
|
const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
|
|
47
49
|
const appConfig: AppConfig = useInjectable(AppConfig);
|
|
48
50
|
const customPanelSize = appConfig.panelSizes && appConfig.panelSizes[side];
|
|
49
|
-
|
|
51
|
+
|
|
52
|
+
const currentContainerId = useMemo(
|
|
53
|
+
() => props.currentContainerId || tabbarService.currentContainerId,
|
|
54
|
+
[props.currentContainerId, tabbarService.currentContainerId],
|
|
55
|
+
);
|
|
50
56
|
|
|
51
57
|
React.useEffect(() => {
|
|
52
58
|
// panelSize = 384-1-48
|
|
@@ -86,14 +92,14 @@ export const BaseTabPanelView: React.FC<IBaseTabPanelView> = observer(({ PanelVi
|
|
|
86
92
|
);
|
|
87
93
|
});
|
|
88
94
|
|
|
89
|
-
const ContainerView: React.FC<{
|
|
95
|
+
export const ContainerView: React.FC<{
|
|
90
96
|
component: ComponentRegistryInfo;
|
|
91
97
|
side: string;
|
|
92
98
|
titleMenu: IMenu;
|
|
93
99
|
}> = observer(({ component, titleMenu, side }) => {
|
|
94
100
|
const ref = React.useRef<HTMLElement | null>();
|
|
95
101
|
const containerRef = React.useRef<HTMLDivElement | null>(null);
|
|
96
|
-
const
|
|
102
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
97
103
|
const { title, titleComponent, component: CustomComponent, containerId } = component.options || {};
|
|
98
104
|
const injector: Injector = useInjectable(INJECTOR_TOKEN);
|
|
99
105
|
const handleContextMenu = (e: React.MouseEvent) => {
|
|
@@ -110,14 +116,21 @@ const ContainerView: React.FC<{
|
|
|
110
116
|
}
|
|
111
117
|
const viewState = useViewState(side, containerRef);
|
|
112
118
|
|
|
119
|
+
const PANEL_TITLEBAR_HEIGHT = React.useMemo(
|
|
120
|
+
() => appConfig.layoutViewSize?.PANEL_TITLEBAR_HEIGHT || LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT,
|
|
121
|
+
[appConfig],
|
|
122
|
+
);
|
|
123
|
+
|
|
113
124
|
return (
|
|
114
125
|
<div ref={containerRef} className={styles.view_container}>
|
|
115
126
|
{!CustomComponent && (
|
|
116
127
|
<div onContextMenu={handleContextMenu} className={styles.panel_titlebar}>
|
|
117
|
-
{!title ? null :
|
|
128
|
+
{!title ? null : (
|
|
129
|
+
<TitleBar title={title} height={PANEL_TITLEBAR_HEIGHT} menubar={<InlineActionBar menus={titleMenu} />} />
|
|
130
|
+
)}
|
|
118
131
|
{titleComponent && (
|
|
119
132
|
<div className={styles.panel_component}>
|
|
120
|
-
<ConfigProvider value={
|
|
133
|
+
<ConfigProvider value={appConfig}>
|
|
121
134
|
<ComponentRenderer Component={titleComponent} initialProps={component.options?.titleProps} />
|
|
122
135
|
</ConfigProvider>
|
|
123
136
|
</div>
|
|
@@ -127,7 +140,7 @@ const ContainerView: React.FC<{
|
|
|
127
140
|
<div className={styles.container_wrap} ref={(ele) => (ref.current = ele)}>
|
|
128
141
|
<ProgressBar progressModel={indicator.progressModel} />
|
|
129
142
|
{CustomComponent ? (
|
|
130
|
-
<ConfigProvider value={
|
|
143
|
+
<ConfigProvider value={appConfig}>
|
|
131
144
|
<ComponentRenderer
|
|
132
145
|
initialProps={{ viewState, ...component.options?.initialProps }}
|
|
133
146
|
Component={CustomComponent}
|
|
@@ -152,7 +165,7 @@ const BottomPanelView: React.FC<{
|
|
|
152
165
|
}> = observer(({ component, titleMenu, side }) => {
|
|
153
166
|
const ref = React.useRef<HTMLElement | null>();
|
|
154
167
|
const containerRef = React.useRef<HTMLDivElement | null>(null);
|
|
155
|
-
const
|
|
168
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
156
169
|
const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
|
|
157
170
|
const { component: CustomComponent, containerId } = component.options || {};
|
|
158
171
|
const titleComponent = component.options && component.options.titleComponent;
|
|
@@ -167,9 +180,14 @@ const BottomPanelView: React.FC<{
|
|
|
167
180
|
}
|
|
168
181
|
const viewState = useViewState(side, containerRef);
|
|
169
182
|
|
|
183
|
+
const PANEL_TITLEBAR_HEIGHT = React.useMemo(
|
|
184
|
+
() => appConfig.layoutViewSize?.PANEL_TITLEBAR_HEIGHT || LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT,
|
|
185
|
+
[appConfig],
|
|
186
|
+
);
|
|
187
|
+
|
|
170
188
|
return (
|
|
171
189
|
<div ref={containerRef} className={styles.panel_container}>
|
|
172
|
-
<div className={styles.panel_title_bar} style={{ height:
|
|
190
|
+
<div className={styles.panel_title_bar} style={{ height: PANEL_TITLEBAR_HEIGHT }}>
|
|
173
191
|
<h1>{component.options?.title?.toUpperCase()}</h1>
|
|
174
192
|
<div className={styles.title_component_container}>
|
|
175
193
|
{titleComponent && (
|
|
@@ -184,7 +202,7 @@ const BottomPanelView: React.FC<{
|
|
|
184
202
|
<div className={styles.container_wrap} ref={(ele) => (ref.current = ele)}>
|
|
185
203
|
<ProgressBar progressModel={indicator.progressModel} />
|
|
186
204
|
{CustomComponent ? (
|
|
187
|
-
<ConfigProvider value={
|
|
205
|
+
<ConfigProvider value={appConfig}>
|
|
188
206
|
<ComponentRenderer
|
|
189
207
|
initialProps={{ viewState, ...component.options?.initialProps }}
|
|
190
208
|
Component={CustomComponent}
|
|
@@ -87,7 +87,7 @@ export const RightTabRenderer = ({
|
|
|
87
87
|
<TabRendererBase
|
|
88
88
|
side='right'
|
|
89
89
|
direction='right-to-left'
|
|
90
|
-
id={VIEW_CONTAINERS.
|
|
90
|
+
id={VIEW_CONTAINERS.RIGHT_TABBAR_PANEL}
|
|
91
91
|
className={clsx(className, 'right-slot')}
|
|
92
92
|
components={components}
|
|
93
93
|
TabbarView={RightTabbarRenderer}
|