瀏覽代碼

Merge pull request #7258 from ycw/master

support `initialTab` for embedded mode
David Catuhe 5 年之前
父節點
當前提交
347e45ef25
共有 3 個文件被更改,包括 10 次插入6 次删除
  1. 7 4
      inspector/src/components/embedHost/embedHostComponent.tsx
  2. 2 1
      inspector/src/inspector.ts
  3. 1 1
      src/Debug/debugLayer.ts

+ 7 - 4
inspector/src/components/embedHost/embedHostComponent.tsx

@@ -5,7 +5,7 @@ import { SceneExplorerComponent } from "../sceneExplorer/sceneExplorerComponent"
 import { ActionTabsComponent } from "../actionTabs/actionTabsComponent";
 import { Scene } from "babylonjs/scene";
 import { GlobalState } from "../../components/globalState";
-import { IExplorerExtensibilityGroup } from 'babylonjs/Debug/debugLayer';
+import { IExplorerExtensibilityGroup, DebugLayerTab } from 'babylonjs/Debug/debugLayer';
 
 const Split = require('split.js').default;
 
@@ -19,7 +19,8 @@ interface IEmbedHostComponentProps {
     noExpand?: boolean,
     onClose: () => void,
     onPopup: () => void,
-    extensibilityGroups?: IExplorerExtensibilityGroup[]
+    extensibilityGroups?: IExplorerExtensibilityGroup[],
+    initialTab?: DebugLayerTab
 }
 
 export class EmbedHostComponent extends React.Component<IEmbedHostComponentProps> {
@@ -57,7 +58,8 @@ export class EmbedHostComponent extends React.Component<IEmbedHostComponentProps
                     <div id="bottomPart" style={{ marginTop: "4px", overflow: "hidden" }}>
                         <ActionTabsComponent scene={this.props.scene}
                             popupMode={true}
-                            globalState={this.props.globalState} noHeader={true} />
+                            globalState={this.props.globalState} noHeader={true} 
+                            initialTab={this.props.initialTab} />
                     </div>
                 </div>
             )
@@ -76,7 +78,8 @@ export class EmbedHostComponent extends React.Component<IEmbedHostComponentProps
                     <ActionTabsComponent scene={this.props.scene}
                         globalState={this.props.globalState}
                         popupMode={true}
-                        noHeader={true} />
+                        noHeader={true}
+                        initialTab={this.props.initialTab} />
                 </div>
             </div>
         )

+ 2 - 1
inspector/src/inspector.ts

@@ -251,7 +251,8 @@ export class Inspector {
                     if (options.popup) {
                         this._EmbedHostWindow.close();
                     }
-                }
+                },
+                initialTab: options.initialTab
             });
             ReactDOM.render(embedHostElement, this._EmbedHost);
         }

+ 1 - 1
src/Debug/debugLayer.ts

@@ -83,7 +83,7 @@ export interface IInspectorOptions {
     /**
      * Optional initial tab (default to DebugLayerTab.Properties)
      */
-    initialTab?: DebugLayerTab.Properties;
+    initialTab?: DebugLayerTab;
 }
 
 declare module "../scene" {