GOOD rebase

Author: gjmooney

packages/base/src/panelview/leftpanel.tsx

@@ -184,41 +184,42 @@ export const LeftPanel: React.FC<ILeftPanelProps> = (
             ))}
           </TabsList>
 
-        {!settings.layersDisabled && (
-          <TabsContent
-            value="layers"
-            className="jgis-panel-tab-content jp-gis-layerPanel"
-          >
-            <LayersBodyComponent
-              model={props.model}
-              commands={props.commands}
-              state={props.state}
-              layerTree={filteredLayerTree}
-            ></LayersBodyComponent>
-          </TabsContent>
-        )}
+          {!settings.layersDisabled && (
+            <TabsContent
+              value="layers"
+              className="jgis-panel-tab-content jp-gis-layerPanel"
+            >
+              <LayersBodyComponent
+                model={props.model}
+                commands={props.commands}
+                state={props.state}
+                layerTree={filteredLayerTree}
+              ></LayersBodyComponent>
+            </TabsContent>
+          )}
 
           {!settings.stacBrowserDisabled && (
             <TabsContent value="stac" className="jgis-panel-tab-content">
               <StacPanel model={props.model} />
             </TabsContent>
           )}
 
-        {!settings.filtersDisabled && (
-          <TabsContent value="filters" className="jgis-panel-tab-content">
-            <FilterComponent model={props.model}></FilterComponent>
+          {!settings.filtersDisabled && (
+            <TabsContent value="filters" className="jgis-panel-tab-content">
+              <FilterComponent model={props.model}></FilterComponent>
+            </TabsContent>
+          )}
+
+          <TabsContent value="landmarks" className="jgis-panel-tab-content">
+            <LayersBodyComponent
+              model={props.model}
+              commands={props.commands}
+              state={props.state}
+              layerTree={landmarkLayerTree}
+            ></LayersBodyComponent>
           </TabsContent>
-        )}
-
-        <TabsContent value="landmarks" className="jgis-panel-tab-content">
-          <LayersBodyComponent
-            model={props.model}
-            commands={props.commands}
-            state={props.state}
-            layerTree={landmarkLayerTree}
-          ></LayersBodyComponent>
-        </TabsContent>
-      </PanelTabs>
-    </div>
+        </PanelTabs>
+      </div>
+    </Draggable>
   );
 };

packages/base/src/panelview/rightpanel.tsx

@@ -124,35 +124,36 @@ export const RightPanel: React.FC<IRightPanelProps> = props => {
             ))}
           </TabsList>
 
-          {!settings.objectPropertiesDisabled && (
-            <TabsContent
-              value="objectProperties"
-              className="jgis-panel-tab-content"
-            >
-              <ObjectPropertiesReact
-                setSelectedObject={setSelectedObjectProperties}
-                selectedObject={selectedObjectProperties}
-                formSchemaRegistry={props.formSchemaRegistry}
-                model={props.model}
-              />
-            </TabsContent>
-          )}
+          {!settings.objectPropertiesDisabled &&
+            !settings.storyMapPresentation && (
+              <TabsContent
+                value="objectProperties"
+                className="jgis-panel-tab-content"
+              >
+                <ObjectPropertiesReact
+                  setSelectedObject={setSelectedObjectProperties}
+                  selectedObject={selectedObjectProperties}
+                  formSchemaRegistry={props.formSchemaRegistry}
+                  model={props.model}
+                />
+              </TabsContent>
+            )}
 
           <TabsContent
             value="storyPanel"
             className="jgis-panel-tab-content"
             style={{ paddingTop: 0 }}
           >
-            {settings.storyMapPresentation || !displayEditor ? (
-              <StoryViewerPanel
-                model={props.model}
-                togglePreview={toggleEditor}
+            {!settings.storyMapPresentation && (
+              <PreviewModeSwitch
+                checked={!displayEditor}
+                onCheckedChange={toggleEditor}
               />
+            )}
+            {settings.storyMapPresentation || !displayEditor ? (
+              <StoryViewerPanel model={props.model} />
             ) : (
-              <StoryEditorPanel
-                model={props.model}
-                togglePreview={toggleEditor}
-              />
+              <StoryEditorPanel model={props.model} />
             )}
           </TabsContent>