Sidebar (#1228)

* Flytt sidebarklasse ut av panel .. slik at vi kan slette panel * klasse sidebar på VenstreVinduContainer * Fix warning
Artsdatabanken · Apr 1, 2019 · 2b35d03 · 2b35d03
1 parent c51ff34
commit 2b35d03
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 25 deletions.
diff --git a/src/Grunnkart/Grunnkart.js b/src/Grunnkart/Grunnkart.js
@@ -210,27 +210,29 @@ class Grunnkart extends React.Component {
                 }}
               >
                 {context.aktivTab === "meny" && (
-                  <VenstreVinduContainer
-                    aktiveLag={this.state.aktiveLag}
-                    mapBounds={this.state.actualBounds}
-                    onMouseEnter={this.handleMouseEnter}
-                    onMouseLeave={this.handleMouseLeave}
-                    onFitBounds={this.handleFitBounds}
-                    erAktivert={erAktivert}
-                    opplystKode={this.state.opplystKode}
-                    onToggleLayer={() => {
-                      this.handleToggleLayer();
-                      if (!context.visAktiveLag) context.onToggleAktiveLag();
-                    }}
-                    onRemoveSelectedLayer={this.handleRemoveSelectedLayer}
-                    meta={this.state.meta}
-                    searchFor={this.state.searchFor}
-                    onClearSearchFor={this.handleClearSearchFor}
-                    onUpdateLayerProp={this.handleUpdateLayerProp}
-                    onUpdateMetaProp={this.handleUpdateMetaProp}
-                    visAktiveLag={context.visAktiveLag}
-                    onToggleAktiveLag={context.onToggleAktiveLag}
-                  />
+                  <div className="sidebar">
+                    <VenstreVinduContainer
+                      aktiveLag={this.state.aktiveLag}
+                      mapBounds={this.state.actualBounds}
+                      onMouseEnter={this.handleMouseEnter}
+                      onMouseLeave={this.handleMouseLeave}
+                      onFitBounds={this.handleFitBounds}
+                      erAktivert={erAktivert}
+                      opplystKode={this.state.opplystKode}
+                      onToggleLayer={() => {
+                        this.handleToggleLayer();
+                        if (!context.visAktiveLag) context.onToggleAktiveLag();
+                      }}
+                      onRemoveSelectedLayer={this.handleRemoveSelectedLayer}
+                      meta={this.state.meta}
+                      searchFor={this.state.searchFor}
+                      onClearSearchFor={this.handleClearSearchFor}
+                      onUpdateLayerProp={this.handleUpdateLayerProp}
+                      onUpdateMetaProp={this.handleUpdateMetaProp}
+                      visAktiveLag={context.visAktiveLag}
+                      onToggleAktiveLag={context.onToggleAktiveLag}
+                    />
+                  </div>
                 )}
                 <Kart
                   bounds={this.state.fitBounds}

diff --git a/src/Informasjon/Informasjon.js b/src/Informasjon/Informasjon.js
@@ -4,13 +4,16 @@ import "./Informasjon.css";
 
 const Informasjon = props => {
   if (props.location.pathname !== "/") return null;
-  const [turnOffInfo, setturnOffInfo] = useState("på");
+  const [showInfo, setShowInfo] = useState(true);
   return (
     <React.Fragment>
-      {turnOffInfo !== "turn off" && (
+      {showInfo !== "turn off" && (
         <div
           className="info_component"
-          onClick={() => props.history.push("/Natur_i_Norge/Landskap/")}
+          onClick={() => {
+            props.history.push("/Natur_i_Norge/Landskap/");
+            setShowInfo(false);
+          }}
         >
           <div className="infoBox">
             <div className="top_image">

diff --git a/src/components/Panel.js b/src/components/Panel.js
@@ -1,5 +1,5 @@
 import React from "react";
 
-const Panel = ({ children }) => <div className="sidebar">{children}</div>;
+const Panel = ({ children }) => <div>{children}</div>;
 
 export default Panel;