✨ (entity selector) redesign

owid · May 3, 2024 · ddd7612 · ddd7612
1 parent 1082fe0
commit ddd7612
Show file tree

Hide file tree

Showing 21 changed files with 718 additions and 291 deletions.
diff --git a/packages/@ourworldindata/components/src/Checkbox.scss b/packages/@ourworldindata/components/src/Checkbox.scss
@@ -12,6 +12,7 @@
         opacity: 0;
         left: 0;
         cursor: pointer;
+        pointer-events: none;
     }
 
     .custom {
@@ -57,11 +58,11 @@
     }
 
     .label {
+        @include grapher_label-2-regular;
         padding-left: $checkbox-size + 8px;
         cursor: pointer;
-        font-size: 14px;
-        letter-spacing: 0.01em;
-        line-height: 1.15;
+        user-select: none;
+        color: $dark-text;
     }
 
     &:hover {

diff --git a/packages/@ourworldindata/components/src/Checkbox.tsx b/packages/@ourworldindata/components/src/Checkbox.tsx
@@ -4,8 +4,8 @@ import { faCheck } from "@fortawesome/free-solid-svg-icons"
 
 export class Checkbox extends React.Component<{
     checked: boolean
-    onChange: () => any
-    label: string | React.ReactNode
+    onChange: React.ChangeEventHandler<HTMLInputElement>
+    label: React.ReactNode
 }> {
     render(): JSX.Element {
         const { checked, onChange, label } = this.props

diff --git a/packages/@ourworldindata/grapher/src/controls/RadioButton.scss b/packages/@ourworldindata/grapher/src/controls/RadioButton.scss
@@ -0,0 +1,52 @@
+.radio {
+    $radio-size: 16px;
+
+    $light-stroke: #a4b6ca;
+    $active-fill: #6e87a2;
+
+    position: relative;
+
+    input {
+        position: absolute;
+        opacity: 0;
+        left: 0;
+        cursor: pointer;
+        pointer-events: none;
+    }
+
+    .outer {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: $radio-size;
+        height: $radio-size;
+
+        background: white;
+        pointer-events: none;
+        border-radius: 50%;
+        border: 1px solid $light-stroke;
+
+        display: flex;
+        align-items: center;
+        justify-content: center;
+
+        .inner {
+            width: $radio-size / 2;
+            height: $radio-size / 2;
+            background-color: $active-fill;
+            border-radius: 50%;
+        }
+    }
+
+    input:focus-visible + .outer {
+        outline: 2px solid $controls-color;
+    }
+
+    .label {
+        @include grapher_label-2-regular;
+        padding-left: $radio-size + 8px;
+        cursor: pointer;
+        user-select: none;
+        color: $dark-text;
+    }
+}
diff --git a/packages/@ourworldindata/grapher/src/controls/RadioButton.tsx b/packages/@ourworldindata/grapher/src/controls/RadioButton.tsx
@@ -0,0 +1,29 @@
+import React from "react"
+
+export class RadioButton extends React.Component<{
+    checked: boolean
+    onChange: React.ChangeEventHandler<HTMLInputElement>
+    label: React.ReactNode
+    group?: string
+}> {
+    render(): JSX.Element {
+        const { checked, onChange, label, group } = this.props
+
+        return (
+            <div className="radio">
+                <label>
+                    <input
+                        type="radio"
+                        name={group}
+                        checked={checked}
+                        onChange={onChange}
+                    />
+                    <div className="outer">
+                        {checked && <div className="inner" />}
+                    </div>
+                    <div className="label">{label}</div>
+                </label>
+            </div>
+        )
+    }
+}
diff --git a/packages/@ourworldindata/grapher/src/core/Grapher.tsx b/packages/@ourworldindata/grapher/src/core/Grapher.tsx
@@ -202,7 +202,10 @@ import {
 } from "../captionedChart/StaticChartRasterizer.js"
 import { SlopeChartManager } from "../slopeCharts/SlopeChart"
 import { SidePanel } from "../sidePanel/SidePanel"
-import { EntitySelector } from "../entitySelector/EntitySelector"
+import {
+    EntitySelector,
+    type EntitySelectorState,
+} from "../entitySelector/EntitySelector"
 import { SlideInDrawer } from "../slideInDrawer/SlideInDrawer"
 
 declare global {
@@ -464,6 +467,9 @@ export class Grapher
 
     @observable.ref legacyConfigAsAuthored: Partial<LegacyGrapherInterface> = {}
 
+    // stored on Grapher so state is preserved when switching to full-screen mode
+    @observable entitySelectorState: Partial<EntitySelectorState> = {}
+
     @computed get dataApiUrlForAdmin(): string | undefined {
         return this.props.dataApiUrlForAdmin
     }
@@ -2146,7 +2152,7 @@ export class Grapher
             0,
             // the chart takes up 9 columns in 12-column grid
             (9 / 12) * this.frameBounds.width,
-            this.frameBounds.height
+            this.frameBounds.height - 2 // 2px accounts for the border
         )
     }
 
@@ -2157,7 +2163,7 @@ export class Grapher
             0, // not in use; intentionally set to zero
             0, // not in use; intentionally set to zero
             this.frameBounds.width - this.captionedChartBounds.width,
-            this.frameBounds.height
+            this.captionedChartBounds.height
         )
     }
 
@@ -2646,7 +2652,7 @@ export class Grapher
                             !this.isEntitySelectorModalOrDrawerOpen
                     }}
                 >
-                    <EntitySelector manager={this} />
+                    <EntitySelector manager={this} autoFocus={true} />
                 </SlideInDrawer>
 
                 {/* tooltip */}
@@ -3133,7 +3139,7 @@ export class Grapher
         return this.canHighlightEntities
             ? `Select ${this.entityTypePlural}`
             : this.canChangeEntity
-              ? `Change ${a(this.entityType)}`
+              ? `Choose ${a(this.entityType)}`
               : `Add/remove ${this.entityTypePlural}`
     }
 

diff --git a/packages/@ourworldindata/grapher/src/core/GrapherConstants.ts b/packages/@ourworldindata/grapher/src/core/GrapherConstants.ts
@@ -4,16 +4,18 @@ export const GRAPHER_EMBEDDED_FIGURE_ATTR = "data-grapher-src"
 export const GRAPHER_EMBEDDED_FIGURE_CONFIG_ATTR = "data-grapher-config"
 
 export const GRAPHER_PAGE_BODY_CLASS = "StandaloneGrapherOrExplorerPage"
-
 export const GRAPHER_DRAWER_ID = "grapher-drawer"
-
 export const GRAPHER_IS_IN_IFRAME_CLASS = "IsInIframe"
+export const GRAPHER_SCROLLABLE_CONTAINER_CLASS = "scrollable-container"
+export const GRAPHER_TIMELINE_CLASS = "timeline-component"
+export const GRAPHER_ENTITY_SELECTOR_CLASS = "entity-selector"
 
 export const DEFAULT_GRAPHER_CONFIG_SCHEMA =
     "https://files.ourworldindata.org/schemas/grapher-schema.004.json"
 
 export const DEFAULT_GRAPHER_ENTITY_TYPE = "country or region"
 export const DEFAULT_GRAPHER_ENTITY_TYPE_PLURAL = "countries and regions"
+
 export const GRAPHER_MOUNTED_EVENT_NAME = "grapherMounted"
 export const GRAPHER_LOADED_EVENT_NAME = "grapherLoaded"
 

diff --git a/packages/@ourworldindata/grapher/src/core/grapher.scss b/packages/@ourworldindata/grapher/src/core/grapher.scss
@@ -87,6 +87,7 @@ $zindex-controls-drawer: 150;
 @import "../fullScreen/FullScreen.scss";
 @import "../../../components/src/Checkbox.scss";
 @import "../closeButton/CloseButton.scss";
+@import "../controls/RadioButton.scss";
 
 .grapher_dark {
     color: $dark-text;

diff --git a/packages/@ourworldindata/grapher/src/core/typography.scss b/packages/@ourworldindata/grapher/src/core/typography.scss
@@ -83,6 +83,24 @@
     @include grapher_body-3-medium;
 }
 
+@mixin grapher_body-3-regular {
+    @include grapher_body-3-medium;
+    font-weight: 400;
+}
+
+.grapher_body-3-regular {
+    @include grapher_body-3-regular;
+}
+
+@mixin grapher_body-3-medium-italic {
+    @include grapher_body-3-medium;
+    font-style: italic;
+}
+
+.grapher_body-3-medium-italic {
+    @include grapher_body-3-medium-italic;
+}
+
 //
 // labels
 //
@@ -101,3 +119,18 @@
 .grapher_label-1-medium {
     @include grapher_label-1-medium;
 }
+
+@mixin grapher_label-2-regular {
+    display: block;
+    margin: 0;
+
+    font-family: $sans-serif-font-stack;
+    font-size: 0.8125rem;
+    font-weight: 400;
+    line-height: 1.2;
+    letter-spacing: 0.01em;
+}
+
+.grapher_label-2-regular {
+    @include grapher_label-2-regular;
+}