@xylabs/sdk-react 2.8.2 → 2.9.1

package/package.json

@@ -9,16 +9,16 @@
     "url": "https://github.com/xylabs/sdk-react/issues"
   },
   "dependencies": {
-    "@types/numeral": "^2.0.2",
-    "@types/react-helmet": "^6.1.5",
-    "@xylabs/sdk-js": "^2.3.25",
-    "axios": "^0.24.0",
-    "lodash": "^4.17.21",
-    "md5": "^2.3.0",
-    "numeral": "^2.0.6",
-    "query-string": "^7.1.0",
-    "react-helmet": "^6.1.0",
-    "react-icons": "^4.3.1"
+    "@types/react-helmet": "^6",
+    "@xylabs/sdk-js": "^2",
+    "axios": "^0",
+    "bn.js": "^5",
+    "lodash": "^4",
+    "md5": "^2",
+    "numeral": "^2",
+    "query-string": "^7",
+    "react-helmet": "^6",
+    "react-icons": "^4"
   },
   "description": "Common React library for all XY Labs projects that use React",
   "devDependencies": {
@@ -26,34 +26,34 @@
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
     "@ethersproject/abstract-signer": "^5.5.0",
-    "@ethersproject/providers": "^5.5.1",
-    "@mui/icons-material": "^5.2.5",
-    "@mui/material": "^5.2.7",
-    "@mui/styles": "^5.2.3",
+    "@ethersproject/providers": "^5.5.2",
+    "@mui/icons-material": "^5.3.0",
+    "@mui/material": "^5.3.0",
+    "@mui/styles": "^5.3.0",
     "@rollup/plugin-image": "^2.1.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-replace": "^3.0.1",
     "@rollup/plugin-strip": "^2.1.0",
     "@rollup/plugin-typescript": "^8.3.0",
-    "@storybook/addon-actions": "^6.4.9",
-    "@storybook/addon-docs": "^6.4.9",
-    "@storybook/addon-essentials": "^6.4.9",
-    "@storybook/addon-links": "^6.4.9",
-    "@storybook/components": "^6.4.9",
-    "@storybook/core-events": "^6.4.9",
-    "@storybook/react": "^6.4.9",
+    "@storybook/addon-actions": "^6.4.13",
+    "@storybook/addon-docs": "^6.4.13",
+    "@storybook/addon-essentials": "^6.4.13",
+    "@storybook/addon-links": "^6.4.13",
+    "@storybook/components": "^6.4.13",
+    "@storybook/core-events": "^6.4.13",
+    "@storybook/react": "^6.4.13",
     "@types/bn.js": "^5.1.0",
     "@types/lodash": "^4.14.178",
     "@types/md5": "^2.3.1",
-    "@types/node": "^17.0.8",
+    "@types/node": "^17.0.10",
+    "@types/numeral": "^2",
     "@types/react": "^17",
     "@xylabs/eslint-config-react": "^2",
-    "@xylabs/pixel": "^1.2.5",
-    "@xylabs/rollup-config": "^1.0.5",
+    "@xylabs/pixel": "^1.2.6",
+    "@xylabs/rollup-config": "^1.1.1",
     "@xylabs/ts-scripts": "^1.0.24",
-    "@xylabs/tsconfig": "^1.0.8",
+    "@xylabs/tsconfig": "^1.0.9",
     "babel-loader": "^8.2.3",
-    "bn.js": "^5.2.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8",
     "eslint-plugin-prettier": "^4.0.0",
@@ -64,7 +64,7 @@
     "react-dom": "^17.0.2",
     "react-router-dom": "^6",
     "rollbar": "^2",
-    "rollup": "^2.63.0",
+    "rollup": "^2.64.0",
     "rollup-plugin-svg": "^2.0.0",
     "ts-node": "^10.4.0",
     "tslib": "^2.3.1",
@@ -103,7 +103,6 @@
     "@mui/styles": "^5",
     "@xylabs/pixel": "^1",
     "@xylabs/sdk-js": "^2",
-    "bn.js": "^5",
     "react": "^17",
     "react-dom": "^17",
     "react-router-dom": "^6"
@@ -131,5 +130,5 @@
   },
   "sideEffects": false,
   "types": "dist/index.d.ts",
-  "version": "2.8.2"
+  "version": "2.9.1"
 }

package/rollup.config.js

@@ -2,4 +2,4 @@ import { getRollupConfig } from '@xylabs/rollup-config'
 
 import pkg from './package.json'
 
-export default getRollupConfig(pkg)
+export default getRollupConfig({pkg})

package/src/components/BasePage/BasePage.stories.tsx

@@ -15,8 +15,13 @@ const StorybookEntry = {
 
 const Template: ComponentStory<typeof BasePage> = (args) => <BasePage {...args}></BasePage>
 
+const AppBar = () => <div>AppBar</div>
+const FilterBar = () => <div>FilterBar</div>
+
 const Default = Template.bind({})
 Default.args = {
+  appBar: <AppBar />,
+  filterBar: <FilterBar />,
   title: 'Default',
 }
 

package/src/components/BasePage/BasePage.tsx

@@ -18,7 +18,9 @@ const BasePage: React.FC<BasePageProps> = ({
   appFooter,
   appBar,
   cookieConsent,
+  filterBar,
   hideAppBar,
+  hideFilterBar,
   noindex = false,
   scrollToTopButton = false,
   title,
@@ -40,6 +42,7 @@ const BasePage: React.FC<BasePageProps> = ({
       <Helmet title={title}>{noindex ? <meta content="noindex" name="robots" /> : null}</Helmet>
       {scrollToTopButton ? <div id={scrollToTopAnchorId} /> : null}
       {hideAppBar ? null : appBar}
+      {hideFilterBar ? null : filterBar}
       {beta ? (
         <FlexRow
           margin={1}

package/src/components/BasePage/BasePageProps.ts

@@ -9,7 +9,9 @@ interface BasePageProps extends BoxProps {
   beta?: boolean
   container?: 'xl' | 'lg' | 'md' | 'sm' | 'xs'
   disableGutters?: boolean
+  filterBar?: ReactElement
   hideAppBar?: boolean
+  hideFilterBar?: boolean
   hideFooter?: boolean
   noindex?: boolean
   cookieConsent?: ReactNode

package/src/components/dialogs/ErrorDialog.tsx

@@ -1,6 +1,5 @@
 import { Dialog, DialogActions, DialogContent, DialogProps, DialogTitle, Typography } from '@mui/material'
 import { AxiosError } from 'axios'
-import React from 'react'
 
 import { ButtonEx } from '../ButtonEx'
 import { FlexRow } from '../FlexBox'

package/src/lib/Tracking/Google/Gtag.ts

@@ -21,11 +21,13 @@ class Gtag {
     this.ga4id = ga4id
     this.awid = awid
     this.domains = domains
-    global.dataLayer = global.dataLayer || []
-    this.gtag = function () {
-      // eslint-disable-next-line prefer-rest-params
-      global.dataLayer.push(arguments)
-    }
+    global.dataLayer = global.dataLayer ?? []
+    this.gtag =
+      global.gtag ??
+      function () {
+        // eslint-disable-next-line prefer-rest-params
+        global.dataLayer.push(arguments)
+      }
     global.gtag = this.gtag
     this.gtag('js', new Date())
     this.gtag('config', ga4id)

package/src/lib/Tracking/Reddit/Rdt.ts

@@ -13,7 +13,10 @@ class Rdt {
   }
 
   private static getRdt() {
-    return global.rdt
+    if (global.rdt) {
+      return global.rdt
+    }
+    console.warn('Missing rdt')
   }
 
   public load(id: string) {

package/src/lib/Tracking/Snapchat/Snaptr.ts

@@ -1,21 +1,20 @@
+import { delay } from '@xylabs/sdk-js'
+
 import { global } from '../../global'
 
 class SnapTr {
-  static pixelId?: string
-
   public static getSnapTr() {
-    return global.snaptr
+    if (global.snaptr) {
+      return global.snaptr
+    }
+    console.warn('Missing snaptr')
   }
 
   public static instance: SnapTr
-  public static init(pixelId: string) {
-    this.pixelId = pixelId
-    this.track('PAGE_VIEW')
-  }
 
-  public static track<T>(event: string, data?: T) {
-    this.getSnapTr()('init', this.pixelId)
+  public static async track<T>(event: string, data?: T) {
     this.getSnapTr()('track', event, data)
+    await delay(0)
   }
 }
 

package/src/lib/Tracking/Tiktok/Ttq.ts

@@ -13,7 +13,10 @@ class Ttq {
   }
 
   public static getTtq() {
-    return global.ttq
+    if (global.ttq) {
+      return global.ttq
+    }
+    console.warn('Missing ttq')
   }
 
   public static page() {