Merge pull request #288 from CivicDataLab/dev

Dev
CivicDataLab · Dec 19, 2023 · 7bc8861 · 7bc8861 · vercel · Dec 19, 2023
2 parents a0fd833 + 6e137f2
commit 7bc8861
Show file tree

Hide file tree

Showing 17 changed files with 734 additions and 969 deletions.
diff --git a/examples/district/app/[locale]/components/district-selector.tsx b/examples/district/app/[locale]/components/district-selector.tsx
@@ -82,7 +82,6 @@ export const DistrictSelector = () => {
             fillOpacity={1}
             mouseover={handleMouseOver}
             mouseout={handleMouseOut}
-            defaultLayer="light_nolabels"
           />
         )}
         <div

diff --git a/packages/opub-ui/package.json b/packages/opub-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "opub-ui",
   "description": "OPub UI Library",
-  "version": "0.0.95",
+  "version": "0.0.96",
   "private": false,
   "license": "MIT",
   "author": "CivicDataLab <tech@civicdatalab.in>",
@@ -115,6 +115,7 @@
     "eslint-config-custom": "*",
     "happy-dom": "^8.2.2",
     "npm-run-all": "^4.1.5",
+    "postcss": "^8.4.32",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-test-renderer": "^18.2.0",

diff --git a/packages/opub-ui/src/components/Popover/Popover.tsx b/packages/opub-ui/src/components/Popover/Popover.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { cn } from '../../utils';
 import styles from './Popover.module.scss';
 import * as Radix from '@radix-ui/react-popover';
 import React from 'react';
@@ -38,6 +39,7 @@ const Content = React.forwardRef(
       children,
       isPortal = true,
       isArrow = false,
+      className,
       ...props
     }: PopoverContentProps,
     forwardedRef: React.Ref<HTMLDivElement>
@@ -47,7 +49,7 @@ const Content = React.forwardRef(
     return (
       <PortalDom className={styles.Portal}>
         <Radix.Content
-          className={styles.Content}
+          className={cn(styles.Content, className)}
           sideOffset={5}
           {...props}
           ref={forwardedRef}

diff --git a/packages/opub-viz/.storybook/preview.tsx b/packages/opub-viz/.storybook/preview.tsx
@@ -1,23 +1,23 @@
-// import '@storybook/addon-actions';
-// import '@storybook/addon-console';
 import { themes } from '@storybook/theming';
-import 'leaflet/dist/leaflet.css';
-import '../assets/styles.css';
+import { Tooltip } from 'opub-ui';
 import React from 'react';
+import '../assets/styles.css';
 
 export const parameters = {
-  parameters: {
-    docs: {
-      theme: themes.light,
-    },
+  docs: {
+    theme: themes.light,
   },
 };
 
 const preview = {
   parameters,
   decorators: [
     (Story) => {
-      return <Story />;
+      return (
+        <Tooltip.Provider>
+          <Story />
+        </Tooltip.Provider>
+      );
     },
   ],
 };

diff --git a/packages/opub-viz/assets/styles.css b/packages/opub-viz/assets/styles.css
@@ -1,4 +1,5 @@
-/* @import './tokens.css'; */
+@import 'leaflet/dist/leaflet.css';
+@import url('opub-ui/dist/assets/styles.css');
 @import '../styles/base.css';
 
 .leaflet-container {