Skip to content

Commit b593912

Browse files
committed
chore: additional pre-release fixes
1 parent 89229b1 commit b593912

File tree

5 files changed

+49
-16
lines changed

5 files changed

+49
-16
lines changed

apps/docs/src/app/(main)/components/material-icons-and-symbols/HowToUseSheet.tsx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@
22

33
import { useAppSize } from "@react-md/core/media-queries/AppSizeProvider";
44
import { Sheet } from "@react-md/core/sheet/Sheet";
5+
import { NullSuspense } from "@react-md/core/suspense/NullSuspense";
56
import { cnb } from "cnbuilder";
7+
import dynamic from "next/dynamic.js";
68
import { type ReactElement } from "react";
79

810
import { DesktopOnly } from "./DesktopOnly.jsx";
911
import styles from "./HowToUseSheet.module.scss";
1012
import { HowToUseSheetContent } from "./HowToUseSheetContent.jsx";
1113
import { HowToUseSheetHeader } from "./HowToUseSheetHeader.jsx";
1214
import { useMaterialIconsAndSymbols } from "./MaterialIconsAndSymbolsProvider.jsx";
13-
import { ResizeHowToUseSheet } from "./ResizeHowToUseSheet.jsx";
15+
16+
const ResizeHowToUseSheet = dynamic(
17+
() =>
18+
import("./ResizeHowToUseSheet.jsx").then((mod) => mod.ResizeHowToUseSheet),
19+
{
20+
ssr: false,
21+
}
22+
);
1423

1524
export interface HowToUseSheetProps {
1625
className: string;
@@ -32,9 +41,11 @@ export function HowToUseSheet(props: HowToUseSheetProps): ReactElement {
3241
disableOverlay={isDesktop}
3342
disableScrollLock={isDesktop}
3443
>
35-
<DesktopOnly>
36-
<ResizeHowToUseSheet />
37-
</DesktopOnly>
44+
<NullSuspense>
45+
<DesktopOnly>
46+
<ResizeHowToUseSheet />
47+
</DesktopOnly>
48+
</NullSuspense>
3849
<HowToUseSheetHeader />
3950
<HowToUseSheetContent />
4051
</Sheet>

packages/codemod/src/transforms/v5-to-v6/coreExportMap.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,16 @@ export const TYPES: ReadonlySet<string> = new Set([
9797
"BEMModifier",
9898
"BEMResult",
9999
"BoxAlignItems",
100+
"BoxBreakpoints",
100101
"BoxFlexDirection",
102+
"BoxGridBreakpointColumns",
103+
"BoxGridBreakpointItemSize",
104+
"BoxGridColumns",
101105
"BoxJustifyContent",
102106
"BoxOptions",
103107
"BoxProps",
108+
"BoxStyles",
109+
"BoxStylesOptions",
104110
"BuildTreeOptions",
105111
"ButtonClassNameOptions",
106112
"ButtonClassNameThemeOptions",
@@ -1053,6 +1059,7 @@ export const VARIABLES: ReadonlySet<string> = new Set([
10531059
"BOTTOM_RIGHT_ANCHOR",
10541060
"Box",
10551061
"box",
1062+
"boxStyles",
10561063
"brown50",
10571064
"brown100",
10581065
"brown200",
@@ -1790,6 +1797,7 @@ export const VARIABLES: ReadonlySet<string> = new Set([
17901797
"useHoverMode",
17911798
"useHoverModeProvider",
17921799
"useHtmlClassName",
1800+
"useInlineCSSVariables",
17931801
"useIntersectionObserver",
17941802
"useIsomorphicLayoutEffect",
17951803
"useKeyboardMovementContext",
@@ -2067,10 +2075,17 @@ export const EXPORT_MAP: Record<string, string> = {
20672075
Box: "@react-md/core/box/Box",
20682076
box: "@react-md/core/box/styles",
20692077
BoxAlignItems: "@react-md/core/box/styles",
2078+
BoxBreakpoints: "@react-md/core/box/styles",
20702079
BoxFlexDirection: "@react-md/core/box/styles",
2080+
BoxGridBreakpointColumns: "@react-md/core/box/styles",
2081+
BoxGridBreakpointItemSize: "@react-md/core/box/styles",
2082+
BoxGridColumns: "@react-md/core/box/styles",
20712083
BoxJustifyContent: "@react-md/core/box/styles",
20722084
BoxOptions: "@react-md/core/box/styles",
20732085
BoxProps: "@react-md/core/box/Box",
2086+
BoxStyles: "@react-md/core/box/styles",
2087+
boxStyles: "@react-md/core/box/styles",
2088+
BoxStylesOptions: "@react-md/core/box/styles",
20742089
brown50: "@react-md/core/theme/colors",
20752090
brown100: "@react-md/core/theme/colors",
20762091
brown200: "@react-md/core/theme/colors",
@@ -3728,6 +3743,7 @@ export const EXPORT_MAP: Record<string, string> = {
37283743
useHoverMode: "@react-md/core/hoverMode/useHoverMode",
37293744
useHoverModeProvider: "@react-md/core/hoverMode/useHoverModeProvider",
37303745
useHtmlClassName: "@react-md/core/useHtmlClassName",
3746+
useInlineCSSVariables: "@react-md/core/theme/useInlineCSSVariables",
37313747
useIntersectionObserver: "@react-md/core/useIntersectionObserver",
37323748
useIsomorphicLayoutEffect: "@react-md/core/useIsomorphicLayoutEffect",
37333749
useKeyboardMovementContext:

packages/core/src/box/_box.scss

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
////
44

55
@use "sass:map";
6-
@use "sass:list";
76
@use "../utils";
87
@use "../media-queries/media-queries";
98

@@ -132,23 +131,24 @@ $item-min-size: 8rem !default;
132131
/// @type Map
133132
$grids: () !default;
134133

134+
/// @type Map
135135
/// @access private
136136
$_breakpoints: (
137137
phone: (
138-
$disable-phone-columns,
139-
$disable-phone-min-item-size,
138+
columns: $disable-phone-columns,
139+
size: $disable-phone-min-item-size,
140140
),
141141
tablet: (
142-
$disable-tablet-columns,
143-
$disable-tablet-min-item-size,
142+
columns: $disable-tablet-columns,
143+
size: $disable-tablet-min-item-size,
144144
),
145145
desktop: (
146-
$disable-desktop-columns,
147-
$disable-desktop-min-item-size,
146+
columns: $disable-desktop-columns,
147+
size: $disable-desktop-min-item-size,
148148
),
149149
large-desktop: (
150-
$disable-large-desktop-columns,
151-
$disable-large-desktop-min-item-size,
150+
columns: $disable-large-desktop-columns,
151+
size: $disable-large-desktop-min-item-size,
152152
),
153153
);
154154

@@ -356,8 +356,8 @@ $variables: (
356356

357357
@each $media, $feature-flags in $_breakpoints {
358358
@include media-queries.media-or-media-query($media) {
359-
$disable-columns: list.nth($feature-flags, 1);
360-
$disable-size: list.nth($feature-flags, 2);
359+
$disable-columns: map.get($feature-flags, columns);
360+
$disable-size: map.nth($feature-flags, size);
361361
@if not $disable-columns {
362362
&--grid-#{$media} {
363363
@include set-var(columns, get-var($media + "-columns"));

packages/react-md/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ export * from "@react-md/core/theme/useColorScheme";
320320
export * from "@react-md/core/theme/useColorSchemeMetaTag";
321321
export * from "@react-md/core/theme/useColorSchemeProvider";
322322
export * from "@react-md/core/theme/useCSSVariables";
323+
export * from "@react-md/core/theme/useInlineCSSVariables";
323324
export * from "@react-md/core/theme/usePrefersDarkTheme";
324325
export * from "@react-md/core/theme/utils";
325326
export * from "@react-md/core/tooltip/constants";

packages/sassdoc-generator/src/formatVariableItem.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@ export async function formatVariableItem(
1515
): Promise<FormattedVariableItem> {
1616
const { type } = item;
1717
const { scope, value } = item.context;
18-
assertValidVariableDataType(type);
18+
try {
19+
assertValidVariableDataType(type);
20+
} catch (e) {
21+
console.error(`${item.context.name} has an invalid type!`);
22+
throw e;
23+
}
1924

2025
let compiled: string | undefined;
2126
if (isCompileable(value)) {

0 commit comments

Comments
 (0)