From e9b3b0c3b67610a4120045d0a7f407acd8413f13 Mon Sep 17 00:00:00 2001 From: Jake Laderman Date: Thu, 10 Oct 2024 22:08:33 -0500 Subject: [PATCH] update ds and fix console errors (#1379) --- www/package.json | 3 ++- www/src/App.tsx | 14 +++++++++----- www/src/components/marketplace/RepoCardList.tsx | 4 +--- .../layout/ResponsiveLayoutContentContainer.tsx | 9 ++++++--- www/yarn.lock | 13 +++++++------ 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/www/package.json b/www/package.json index 98403ef29..4841400d1 100644 --- a/www/package.json +++ b/www/package.json @@ -34,6 +34,7 @@ "dependencies": { "@absinthe/socket": "0.2.1", "@apollo/client": "3.10.3", + "@emotion/is-prop-valid": "1.3.1", "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", "@fireworks-js/react": "2.10.5", @@ -44,7 +45,7 @@ "@nivo/geo": "0.83.0", "@nivo/line": "0.83.0", "@octokit/core": "4.2.1", - "@pluralsh/design-system": "3.74.4", + "@pluralsh/design-system": "3.75.0", "@react-spring/web": "9.7.3", "@stripe/react-stripe-js": "2.1.0", "@stripe/stripe-js": "1.54.0", diff --git a/www/src/App.tsx b/www/src/App.tsx index 77951e303..61e99d81f 100644 --- a/www/src/App.tsx +++ b/www/src/App.tsx @@ -14,7 +14,11 @@ import { useThemeColorMode, } from '@pluralsh/design-system' import { MarkdocContextProvider } from '@pluralsh/design-system/dist/markdoc' -import { CssBaseline, ThemeProvider, mergeTheme } from 'honorable' +import { + CssBaseline, + ThemeProvider as HonorableThemeProvider, + mergeTheme, +} from 'honorable' import styled, { StyleSheetManager, ThemeProvider as StyledThemeProvider, @@ -176,8 +180,8 @@ function App() { - - + + - - + + diff --git a/www/src/components/marketplace/RepoCardList.tsx b/www/src/components/marketplace/RepoCardList.tsx index 877ec8468..d693dedcd 100644 --- a/www/src/components/marketplace/RepoCardList.tsx +++ b/www/src/components/marketplace/RepoCardList.tsx @@ -23,9 +23,6 @@ export function RepoCardList({ to={`/repository/${repository.name}${ urlParams ? `?${urlParams}` : '' }`} - color="text" - textDecoration="none" - width="100%" title={repository.name} imageUrl={getRepoIcon(repository, theme.mode)} publisher={repository.publisher?.name} @@ -50,4 +47,5 @@ const FixedRepositoryCard = styled(RepositoryCard)(({ theme }) => ({ width: '100%', position: 'relative', textDecoration: 'none', + color: theme.colors.text, })) diff --git a/www/src/components/utils/layout/ResponsiveLayoutContentContainer.tsx b/www/src/components/utils/layout/ResponsiveLayoutContentContainer.tsx index 58d86fc71..2bbb98ce3 100644 --- a/www/src/components/utils/layout/ResponsiveLayoutContentContainer.tsx +++ b/www/src/components/utils/layout/ResponsiveLayoutContentContainer.tsx @@ -1,7 +1,9 @@ import { Flex } from 'honorable' -export function ResponsiveLayoutContentContainer(props: any) { - return ( +import { forwardRef } from 'react' + +export const ResponsiveLayoutContentContainer = forwardRef( + (props: any, ref) => ( ) -} +) diff --git a/www/yarn.lock b/www/yarn.lock index a592b599e..36a6ddfe1 100644 --- a/www/yarn.lock +++ b/www/yarn.lock @@ -1911,7 +1911,7 @@ __metadata: languageName: node linkType: hard -"@emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.0, @emotion/is-prop-valid@npm:^1.2.1": +"@emotion/is-prop-valid@npm:1.3.1, @emotion/is-prop-valid@npm:^1.1.0, @emotion/is-prop-valid@npm:^1.2.0, @emotion/is-prop-valid@npm:^1.2.1": version: 1.3.1 resolution: "@emotion/is-prop-valid@npm:1.3.1" dependencies: @@ -4025,9 +4025,9 @@ __metadata: languageName: node linkType: hard -"@pluralsh/design-system@npm:3.74.4": - version: 3.74.4 - resolution: "@pluralsh/design-system@npm:3.74.4" +"@pluralsh/design-system@npm:3.75.0": + version: 3.75.0 + resolution: "@pluralsh/design-system@npm:3.75.0" dependencies: "@floating-ui/react-dom-interactions": 0.13.3 "@loomhq/loom-embed": 1.5.0 @@ -4073,7 +4073,7 @@ __metadata: react-dom: ">=18.3.1" react-transition-group: ">=4.4.5" styled-components: ">=6.1.13" - checksum: b50d9b7f2fda9e769911de1895ed83318771e7fae74fb6c4c3ce8ca88562f4890d4859e806af1bf8fc3175841ca1639e7b64376d1e6d7966d980a8c2e5fcd01a + checksum: 5097f1502fa1fa5e0cffa7bcc572068cf856572542bfd22aab12524261b1a99571c4c20ab012719d50b34b3f27d01b3632227d9a70d9831fdfa91582139e6b72 languageName: node linkType: hard @@ -20073,6 +20073,7 @@ __metadata: dependencies: "@absinthe/socket": 0.2.1 "@apollo/client": 3.10.3 + "@emotion/is-prop-valid": 1.3.1 "@emotion/react": 11.11.1 "@emotion/styled": 11.11.0 "@esbuild-plugins/node-globals-polyfill": 0.2.3 @@ -20092,7 +20093,7 @@ __metadata: "@nivo/geo": 0.83.0 "@nivo/line": 0.83.0 "@octokit/core": 4.2.1 - "@pluralsh/design-system": 3.74.4 + "@pluralsh/design-system": 3.75.0 "@pluralsh/eslint-config-typescript": 2.5.150 "@pluralsh/stylelint-config": 2.0.10 "@react-spring/web": 9.7.3