remove obsolete code; move options next to current value

open-pioneer · Dec 19, 2023 · c9c5fe8 · c9c5fe8
1 parent 6495262
commit c9c5fe8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/src/packages/basemap-switcher/BasemapSwitcher.tsx b/src/packages/basemap-switcher/BasemapSwitcher.tsx
@@ -94,7 +94,7 @@ export const BasemapSwitcher: FC<BasemapSwitcherProps> = (props) => {
             options.push(emptyOption);
         }
 
-        const selectedLayer = options.filter((l) => l.layer === activeBaseLayer)[0];
+        const selectedLayer = options.find((l) => l.layer === activeBaseLayer);
         return { options, selectedLayer };
     }, [allowSelectingEmptyBasemap, baseLayers, map?.layers]);
 
@@ -113,6 +113,7 @@ export const BasemapSwitcher: FC<BasemapSwitcherProps> = (props) => {
                     aria-labelledby={ariaLabelledBy}
                     className="basemap-switcher-select"
                     classNamePrefix="react-select"
+                    options={options}
                     value={selectedLayer}
                     onChange={(option) => option && activateLayer(option.value)}
                     isClearable={false}
@@ -128,7 +129,6 @@ export const BasemapSwitcher: FC<BasemapSwitcherProps> = (props) => {
                     }
                     isOptionDisabled={(option) => option?.layer?.loadState === "error"}
                     components={components}
-                    options={options}
                 />
             ) : null}
         </Box>

diff --git a/src/samples/test-toc/toc-app/AppUI.tsx b/src/samples/test-toc/toc-app/AppUI.tsx
@@ -34,7 +34,7 @@ export function AppUI() {
                     </Box>
                 }
             >
-                <Flex flex="1" direction="column" position="relative">
+                <Flex flex="1" direction="column">
                     <MapContainer
                         mapId={MAP_ID}
                         role="main"
@@ -65,6 +65,7 @@ export function AppUI() {
                                             >
                                                 <Toc
                                                     mapId={MAP_ID}
+                                                    showTools={true}
                                                     basemapSwitcherProps={{
                                                         allowSelectingEmptyBasemap: true
                                                     }}

diff --git a/src/samples/test-toc/toc-app/app.css b/src/samples/test-toc/toc-app/app.css
@@ -1,20 +1 @@
-@media only screen and (max-width: 500px) {
-    .search-top-center-placement {
-        position: absolute;
-        left: 0px;
-        top: 0px;
-        width: 100%;
-        z-index: 1;
-    }
-}
-
-@media only screen and (min-width: 501px) {
-    .search-top-center-placement {
-        position: absolute;
-        left: 50%;
-        top: 0px;
-        transform: translate(-50%, 0px);
-        width: 500px;
-        z-index: 1;
-    }
-}
+/* suppress empty file warning */