Skip to content

Commit 85ef440

Browse files
authored
Merge pull request #31 from make-software/CLICK-840
Product Menu aligning. + fixed paddingScale warning
2 parents 49095d0 + e3df82c commit 85ef440

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

dist/cspr-design.es.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35282,6 +35282,7 @@ function x8(e) {
3528235282
});
3528335283
}
3528435284
const E8 = be(S8).withConfig({
35285+
shouldForwardProp: (e) => e !== "paddingScale",
3528535286
displayName: "tooltip__StyledReactTooltip",
3528635287
componentId: "sc-1m82hpm-0"
3528735288
})(({
@@ -40777,7 +40778,7 @@ const k7 = be.span.withConfig({
4077740778
disabled: C
4077840779
}) => e.withMedia({
4077940780
display: "flex",
40780-
flex: "1 1 auto",
40781+
flex: "0 1 auto",
4078140782
justifyContent: "center",
4078240783
alignItems: "center",
4078340784
padding: ["8px 12px", "8px 12px", "16px"],

dist/cspr-design.umd.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/lib/components/tooltip/tooltip.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/components/navigation/cspr-products-menu/products-menu-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const ProductItemWrapper = styled.span<{
3232
}>(({ theme, isOpen, selected, disabled }) =>
3333
theme.withMedia({
3434
display: 'flex',
35-
flex: '1 1 auto',
35+
flex: '0 1 auto',
3636
justifyContent: 'center',
3737
alignItems: 'center',
3838
padding: ['8px 12px', '8px 12px', '16px'],

src/lib/components/navigation/cspr-products-menu/products-menu.stories.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,8 @@ Primary.args = {
7474
nameLabel={'CSPR.studio (Beta)'}
7575
link={''}
7676
icon={CsprNftStudioIcon}
77-
comingSoonBadgeLabel={'Coming soom'}
77+
comingSoonBadgeLabel={'Coming soon'}
7878
/>
79-
<ProductsMenuItem nameLabel={'some name3'} link={''} icon={''} />
80-
<ProductsMenuItem nameLabel={'some name3'} link={''} icon={''} />
81-
<ProductsMenuItem nameLabel={'some name3'} link={''} icon={''} />
8279
</>
8380
),
8481
};

src/lib/components/tooltip/tooltip.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,11 @@ export interface TooltipProps extends BaseProps {
2828
limitWidth?: boolean | string;
2929
}
3030

31-
const StyledReactTooltip = styled(ReakitTooltip)<StyledReactTooltipProps>(
32-
({ theme, lineHeight = 'sm', scale = 'sm', paddingScale = 2 }) => ({
31+
const StyledReactTooltip = styled(
32+
ReakitTooltip,
33+
).withConfig<StyledReactTooltipProps>({
34+
shouldForwardProp: (prop) => prop !== 'paddingScale',
35+
})(({ theme, lineHeight = 'sm', scale = 'sm', paddingScale = 2 }) => ({
3336
zIndex: theme.zIndex.tooltip,
3437
color: theme.styleguideColors.contentPrimary,
3538
backgroundColor: theme.styleguideColors.backgroundPrimary,

0 commit comments

Comments
 (0)