Skip to content

Commit 8a9ef1e

Browse files
gjmooneygjmooney
committed
Another GOOD rebase
1 parent 4ba4fc0 commit 8a9ef1e

File tree

2 files changed

+71
-90
lines changed

2 files changed

+71
-90
lines changed

‎packages/base/src/panelview/leftpanel.tsx‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -182,42 +182,41 @@ export const LeftPanel: React.FC<ILeftPanelProps> = (
182182
))}
183183
</TabsList>
184184

185-
{!settings.layersDisabled && (
186-
<TabsContent
187-
value="layers"
188-
className="jgis-panel-tab-content jp-gis-layerPanel"
189-
>
190-
<LayersBodyComponent
191-
model={props.model}
192-
commands={props.commands}
193-
state={props.state}
194-
layerTree={filteredLayerTree}
195-
></LayersBodyComponent>
196-
</TabsContent>
197-
)}
185+
{!settings.layersDisabled && (
186+
<TabsContent
187+
value="layers"
188+
className="jgis-panel-tab-content jp-gis-layerPanel"
189+
>
190+
<LayersBodyComponent
191+
model={props.model}
192+
commands={props.commands}
193+
state={props.state}
194+
layerTree={filteredLayerTree}
195+
></LayersBodyComponent>
196+
</TabsContent>
197+
)}
198198

199199
{!settings.stacBrowserDisabled && (
200200
<TabsContent value="stac" className="jgis-panel-tab-content">
201201
<StacPanel model={props.model} />
202202
</TabsContent>
203203
)}
204204

205-
{!settings.filtersDisabled && (
206-
<TabsContent value="filters" className="jgis-panel-tab-content">
207-
<FilterComponent model={props.model}></FilterComponent>
208-
</TabsContent>
209-
)}
210-
211-
<TabsContent value="landmarks" className="jgis-panel-tab-content">
212-
<LayersBodyComponent
213-
model={props.model}
214-
commands={props.commands}
215-
state={props.state}
216-
layerTree={landmarkLayerTree}
217-
></LayersBodyComponent>
205+
{!settings.filtersDisabled && (
206+
<TabsContent value="filters" className="jgis-panel-tab-content">
207+
<FilterComponent model={props.model}></FilterComponent>
218208
</TabsContent>
219-
</PanelTabs>
220-
</div>
221-
</Draggable>
209+
)}
210+
211+
<TabsContent value="landmarks" className="jgis-panel-tab-content">
212+
<LayersBodyComponent
213+
model={props.model}
214+
commands={props.commands}
215+
state={props.state}
216+
layerTree={landmarkLayerTree}
217+
></LayersBodyComponent>
218+
</TabsContent>
219+
</PanelTabs>
220+
</div>
222221
);
223222
};

‎packages/base/src/panelview/rightpanel.tsx‎

Lines changed: 43 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -98,78 +98,60 @@ export const RightPanel: React.FC<IRightPanelProps> = props => {
9898
};
9999

100100
return (
101-
<Draggable handle=".jgis-panel-tabs" bounds=".jGIS-Mainview-Container">
102-
<div
103-
className="jgis-right-panel-container"
104-
style={{ display: rightPanelVisible ? 'block' : 'none' }}
105-
>
106-
<PanelTabs className="jgis-panel-tabs" curTab={curTab}>
107-
<TabsList>
108-
{tabInfo.map(tab => (
109-
<TabsTrigger
110-
className="jGIS-layer-browser-category"
111-
key={tab.name}
112-
value={tab.name}
113-
onClick={() => {
114-
if (curTab !== tab.name) {
115-
setCurTab(tab.name);
116-
} else {
117-
setCurTab('');
118-
}
119-
}}
120-
>
121-
{tab.title}
122-
</TabsTrigger>
123-
))}
124-
</TabsList>
125-
126-
{!settings.objectPropertiesDisabled && (
127-
<TabsContent
128-
value="objectProperties"
129-
className="jgis-panel-tab-content"
101+
<div
102+
className="jgis-right-panel-container"
103+
style={{ display: rightPanelVisible ? 'block' : 'none' }}
104+
>
105+
<PanelTabs className="jgis-panel-tabs" curTab={curTab}>
106+
<TabsList>
107+
{tabInfo.map(tab => (
108+
<TabsTrigger
109+
className="jGIS-layer-browser-category"
110+
key={tab.name}
111+
value={tab.name}
112+
onClick={() => {
113+
if (curTab !== tab.name) {
114+
setCurTab(tab.name);
115+
} else {
116+
setCurTab('');
117+
}
118+
}}
130119
>
131-
<ObjectPropertiesReact
132-
setSelectedObject={setSelectedObjectProperties}
133-
selectedObject={selectedObjectProperties}
134-
formSchemaRegistry={props.formSchemaRegistry}
135-
model={props.model}
136-
/>
137-
</TabsContent>
138-
)}
120+
{tab.title}
121+
</TabsTrigger>
122+
))}
123+
</TabsList>
139124

125+
{!settings.objectPropertiesDisabled && (
140126
<TabsContent
141-
value="storyPanel"
127+
value="objectProperties"
142128
className="jgis-panel-tab-content"
143-
style={{ paddingTop: 0 }}
144129
>
145-
{settings.storyMapPresentationDisabled && (
146-
<PreviewModeSwitch
147-
checked={!displayEditor}
148-
onCheckedChange={toggleEditor}
149-
/>
150-
)}
151-
{!settings.storyMapPresentationDisabled || !displayEditor ? (
152-
<StoryViewerPanel model={props.model} />
153-
) : (
154-
<StoryEditorPanel model={props.model} />
155-
)}
156-
130+
<ObjectPropertiesReact
131+
setSelectedObject={setSelectedObjectProperties}
132+
selectedObject={selectedObjectProperties}
133+
formSchemaRegistry={props.formSchemaRegistry}
134+
model={props.model}
135+
/>
157136
</TabsContent>
158137
)}
159138

160139
<TabsContent
161-
value="storyEditorPanel"
162-
className="jgis-panel-tab-content"
163-
>
164-
{/* switch to this panel when clicking create story */}
165-
<StoryEditorPanel model={props.model}></StoryEditorPanel>
166-
</TabsContent>
167-
168-
<TabsContent
169-
value="storyViewerPanel"
140+
value="storyPanel"
170141
className="jgis-panel-tab-content"
142+
style={{ paddingTop: 0 }}
171143
>
172-
<StoryViewerPanel model={props.model}></StoryViewerPanel>
144+
{settings.storyMapPresentationDisabled && (
145+
<PreviewModeSwitch
146+
checked={!displayEditor}
147+
onCheckedChange={toggleEditor}
148+
/>
149+
)}
150+
{!settings.storyMapPresentationDisabled || !displayEditor ? (
151+
<StoryViewerPanel model={props.model} />
152+
) : (
153+
<StoryEditorPanel model={props.model} />
154+
)}
173155
</TabsContent>
174156

175157
{!settings.annotationsDisabled && (

0 commit comments

Comments
 (0)