Merge pull request #1108 from Vizzuality/fix/national-dashb-changes

nat dash dropdown
Vizzuality · Apr 16, 2024 · e818c2f · e818c2f
2 parents fa9eb3a + d706b9a
commit e818c2f
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 39 deletions.
diff --git a/src/containers/datasets/carbon-market-potential/widget.tsx b/src/containers/datasets/carbon-market-potential/widget.tsx
@@ -60,10 +60,10 @@ const CarbonMarketPotentialWidget = () => {
                 </span>
               </PopoverTrigger>
 
-              <PopoverContent>
-                <ul className="max-h-56 space-y-2">
+              <PopoverContent className="rounded-2xl px-2 shadow-border">
+                <ul className="max-h-32 space-y-0.5">
                   {labels?.map((l) => (
-                    <li key={l} className="last-of-type:pb-4">
+                    <li key={l}>
                       <button
                         className={cn({
                           'font-bold': true,
@@ -94,10 +94,10 @@ const CarbonMarketPotentialWidget = () => {
                 </span>
               </PopoverTrigger>
 
-              <PopoverContent>
-                <ul className="max-h-56 space-y-2">
+              <PopoverContent className="rounded-2xl px-2 shadow-border">
+                <ul className="max-h-32 space-y-0.5">
                   {units?.map((u) => (
-                    <li key={u.label} className="last-of-type:pb-4">
+                    <li key={u.label}>
                       <button
                         aria-label="set unit"
                         className={cn({

diff --git a/src/containers/datasets/habitat-change/widget.tsx b/src/containers/datasets/habitat-change/widget.tsx
@@ -79,7 +79,7 @@ const HabitatExtent = () => {
                 <PopoverContent className="rounded-2xl px-2 shadow-border">
                   <ul className="z-20 max-h-56 space-y-0.5">
                     {years?.map((y) => (
-                      <li key={y} className="last-of-type:pb-4">
+                      <li key={y}>
                         <button
                           aria-label="Select start year"
                           className={cn({
@@ -119,7 +119,7 @@ const HabitatExtent = () => {
                 <PopoverContent className="rounded-2xl px-2 shadow-border">
                   <ul className="z-20 max-h-56 space-y-0.5">
                     {years?.map((y) => (
-                      <li key={y} className="last-of-type:pb-4">
+                      <li key={y}>
                         <button
                           aria-label="select end year"
                           className={cn({

diff --git a/src/containers/datasets/national-dashboard/indicator-source/index.tsx b/src/containers/datasets/national-dashboard/indicator-source/index.tsx
@@ -11,38 +11,19 @@ import Icon from 'components/icon';
 import { Popover, PopoverContent, PopoverTrigger } from 'components/popover';
 import { SwitchWrapper, SwitchRoot, SwitchThumb } from 'components/switch';
 import WidgetControls from 'components/widget-controls';
+import { WIDGET_SELECT_STYLES, WIDGET_SELECT_ARROW_STYLES } from 'styles/widgets';
 import type { ActiveLayers } from 'types/layers';
-import type { WidgetSlugType } from 'types/widget';
 
 import ARROW_SVG from 'svgs/ui/arrow-filled.svg?sprite';
 
 import { DATA_SOURCES } from '../constants';
 
+import type { IndicatorSourceTypes } from './types';
+
 const LABEL_UNITS = {
   km2: 'km²',
 };
 
-type DataSourceTypes = {
-  value: number;
-  layer_link: `globalmangrovewatch.${string}`;
-  download_link: string;
-  layer_info: string;
-  source_layer: string;
-};
-
-type IndicatorSourceTypes = {
-  id: WidgetSlugType;
-  locationIso: string;
-  layerIndex: number;
-  source: string;
-  years: number[];
-  unit: string;
-  dataSource: DataSourceTypes;
-  color: string;
-  yearSelected: number;
-  setYearSelected: (year: number) => void;
-};
-
 const IndicatorSource = ({
   id,
   source,
@@ -91,24 +72,26 @@ const IndicatorSource = ({
         {years.length > 1 && (
           <Popover>
             <PopoverTrigger asChild>
-              <span className="first-line:after relative cursor-pointer border-b-2 border-b-brand-800 font-bold">
+              <span className={`${WIDGET_SELECT_STYLES} print:border-hidden`}>
                 {yearSelected}
                 <Icon
                   icon={ARROW_SVG}
-                  className="absolute -bottom-2.5 left-1/2 inline-block h-2 w-2 -translate-x-1/2"
+                  className={`${WIDGET_SELECT_ARROW_STYLES} print:hidden`}
                   description="Arrow"
                 />
               </span>
             </PopoverTrigger>
 
-            <PopoverContent>
-              <ul className="max-h-56 space-y-2">
+            <PopoverContent className="rounded-2xl px-2 shadow-border">
+              <ul className="max-h-32 space-y-0.5">
                 {years?.map((u) => (
-                  <li key={u} className="last-of-type:pb-4">
+                  <li key={u}>
                     <button
                       aria-label="set year"
                       className={cn({
-                        'font-bold': true,
+                        'w-full rounded-lg py-1 px-2 text-left hover:bg-brand-800/20': true,
+                        'hover:text-brand-800': yearSelected !== u,
+                        'pointer-events-none opacity-50': yearSelected === u,
                       })}
                       type="button"
                       onClick={() => setYearSelected(u)}

diff --git a/src/containers/datasets/national-dashboard/indicator-source/types.ts b/src/containers/datasets/national-dashboard/indicator-source/types.ts
@@ -0,0 +1,22 @@
+import type { WidgetSlugType } from 'types/widget';
+
+type DataSourceTypes = {
+  value: number;
+  layer_link: `globalmangrovewatch.${string}`;
+  download_link: string;
+  layer_info: string;
+  source_layer: string;
+};
+
+export type IndicatorSourceTypes = {
+  id: WidgetSlugType;
+  locationIso: string;
+  layerIndex: number;
+  source: string;
+  years: number[];
+  unit: string;
+  dataSource: DataSourceTypes;
+  color: string;
+  yearSelected: number;
+  setYearSelected: (year: number) => void;
+};
diff --git a/src/containers/datasets/species-distribution/widget.tsx b/src/containers/datasets/species-distribution/widget.tsx
@@ -1,4 +1,4 @@
-import { createRef, useState, useLayoutEffect } from 'react';
+import { createRef, useState, useLayoutEffect, useRef, useEffect } from 'react';
 
 import cn from 'lib/classnames';
 
@@ -28,10 +28,10 @@ const SpeciesDistribution = () => {
 
   const isWorldwide = location === 'Worldwide';
   // const total = data?.total;
-  const ref = createRef<HTMLDivElement>();
+  const ref = useRef<HTMLDivElement>(null);
   const trianglePosition = (total * lineChartWidth) / worldwideTotal - 11; // substract icon size
   // fires synchronously after all DOM mutations.
-  useLayoutEffect(() => {
+  useEffect(() => {
     if (ref && ref.current && ref.current.offsetWidth) {
       setLineChartWidth(ref?.current?.offsetWidth);
     }