Skip to content

Commit 95a17c5

Browse files
committed
Add presentation flags to side panels
1 parent c27d36b commit 95a17c5

File tree

2 files changed

+31
-25
lines changed

2 files changed

+31
-25
lines changed

packages/base/src/panelview/leftpanel.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,12 @@ export const LeftPanel: React.FC<ILeftPanelProps> = (
148148

149149
const tabInfo = [
150150
!settings.layersDisabled ? { name: 'layers', title: 'Layers' } : false,
151-
!settings.stacBrowserDisabled
151+
!settings.stacBrowserDisabled && !settings.storyMapPresentation
152152
? { name: 'stac', title: 'Stac Browser' }
153153
: false,
154-
!settings.filtersDisabled ? { name: 'filters', title: 'Filters' } : false,
154+
!settings.filtersDisabled && !settings.storyMapPresentation
155+
? { name: 'filters', title: 'Filters' }
156+
: false,
155157
{ name: 'landmarks', title: 'Landmarks' },
156158
].filter(Boolean) as { name: string; title: string }[];
157159

packages/base/src/panelview/rightpanel.tsx

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ interface IRightPanelProps {
2525
}
2626

2727
export const RightPanel: React.FC<IRightPanelProps> = props => {
28-
const [displayPreview, setDisplayPreview] = React.useState(false);
28+
const [displayEditor, setDisplayEditor] = React.useState(true);
2929
const [settings, setSettings] = React.useState(props.model.jgisSettings);
3030
const tabInfo = [
3131
!settings.objectPropertiesDisabled
3232
? { name: 'objectProperties', title: 'Object Properties' }
3333
: false,
3434
{
3535
name: 'storyPanel',
36-
title: displayPreview ? 'Story Map' : 'Story Editor',
36+
title: displayEditor ? 'Story Editor' : 'Story Map',
3737
},
3838
!settings.annotationsDisabled
3939
? { name: 'annotations', title: 'Annotations' }
@@ -43,9 +43,12 @@ export const RightPanel: React.FC<IRightPanelProps> = props => {
4343
: false,
4444
].filter(Boolean) as { name: string; title: string }[];
4545

46-
const [curTab, setCurTab] = React.useState<string | undefined>(
47-
tabInfo.length > 0 ? tabInfo[0].name : undefined,
48-
);
46+
const [curTab, setCurTab] = React.useState<string>(() => {
47+
if (settings.storyMapPresentation) {
48+
return 'storyPanel';
49+
}
50+
return tabInfo.length > 0 ? tabInfo[0].name : '';
51+
});
4952

5053
React.useEffect(() => {
5154
const onSettingsChanged = () => {
@@ -89,8 +92,8 @@ export const RightPanel: React.FC<IRightPanelProps> = props => {
8992
const [selectedObjectProperties, setSelectedObjectProperties] =
9093
React.useState(undefined);
9194

92-
const togglePreview = () => {
93-
setDisplayPreview(!displayPreview);
95+
const toggleEditor = () => {
96+
setDisplayEditor(!displayEditor);
9497
};
9598

9699
return (
@@ -118,30 +121,31 @@ export const RightPanel: React.FC<IRightPanelProps> = props => {
118121
))}
119122
</TabsList>
120123

121-
{!settings.objectPropertiesDisabled && (
122-
<TabsContent
123-
value="objectProperties"
124-
className="jgis-panel-tab-content"
125-
>
126-
<ObjectPropertiesReact
127-
setSelectedObject={setSelectedObjectProperties}
128-
selectedObject={selectedObjectProperties}
129-
formSchemaRegistry={props.formSchemaRegistry}
130-
model={props.model}
131-
/>
132-
</TabsContent>
133-
)}
124+
{!settings.objectPropertiesDisabled &&
125+
!settings.storyMapPresentation && (
126+
<TabsContent
127+
value="objectProperties"
128+
className="jgis-panel-tab-content"
129+
>
130+
<ObjectPropertiesReact
131+
setSelectedObject={setSelectedObjectProperties}
132+
selectedObject={selectedObjectProperties}
133+
formSchemaRegistry={props.formSchemaRegistry}
134+
model={props.model}
135+
/>
136+
</TabsContent>
137+
)}
134138

135139
<TabsContent value="storyPanel" className="jgis-panel-tab-content">
136-
{displayPreview ? (
140+
{settings.storyMapPresentation || !displayEditor ? (
137141
<StoryViewerPanel
138142
model={props.model}
139-
togglePreview={togglePreview}
143+
togglePreview={toggleEditor}
140144
/>
141145
) : (
142146
<StoryEditorPanel
143147
model={props.model}
144-
togglePreview={togglePreview}
148+
togglePreview={toggleEditor}
145149
/>
146150
)}
147151
</TabsContent>

0 commit comments

Comments
 (0)