From e02cbe455efd2ee84a08927cfbae4a5ac737ae2d Mon Sep 17 00:00:00 2001 From: Kyle Taborski Date: Mon, 2 Dec 2024 17:18:42 -0800 Subject: [PATCH 1/3] fix: using Popover and s2-parcel example has meta veiwport defined --- examples/s2-parcel-example/src/App.js | 2 +- examples/s2-parcel-example/src/Lazy.js | 11 ++++++----- examples/s2-parcel-example/src/index.html | 1 + examples/s2-vite-project/src/App.tsx | 2 +- examples/s2-vite-project/src/Lazy.tsx | 11 ++++++----- examples/s2-webpack-5-example/src/App.js | 2 +- examples/s2-webpack-5-example/src/Lazy.js | 11 ++++++----- 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/examples/s2-parcel-example/src/App.js b/examples/s2-parcel-example/src/App.js index 26200afa8a1..c7b74c0833a 100644 --- a/examples/s2-parcel-example/src/App.js +++ b/examples/s2-parcel-example/src/App.js @@ -87,7 +87,7 @@ function App() { })} >
- + diff --git a/examples/s2-parcel-example/src/Lazy.js b/examples/s2-parcel-example/src/Lazy.js index 1004a7eaa0a..bc030012fe3 100644 --- a/examples/s2-parcel-example/src/Lazy.js +++ b/examples/s2-parcel-example/src/Lazy.js @@ -44,6 +44,7 @@ import { NumberField, Picker, PickerItem, + Popover, ProgressBar, ProgressCircle, Radio, @@ -247,15 +248,15 @@ export default function Lazy() { - + Disk Status - - C:// + + C:// - + 50% disk space remaining. - + diff --git a/examples/s2-parcel-example/src/index.html b/examples/s2-parcel-example/src/index.html index f7dc96d4b4e..aeff7d6897a 100644 --- a/examples/s2-parcel-example/src/index.html +++ b/examples/s2-parcel-example/src/index.html @@ -2,6 +2,7 @@ + Spectrum 2 + Parcel diff --git a/examples/s2-vite-project/src/App.tsx b/examples/s2-vite-project/src/App.tsx index 8ea3e636222..1f4162034cd 100644 --- a/examples/s2-vite-project/src/App.tsx +++ b/examples/s2-vite-project/src/App.tsx @@ -87,7 +87,7 @@ function App() { })} >
- + diff --git a/examples/s2-vite-project/src/Lazy.tsx b/examples/s2-vite-project/src/Lazy.tsx index 4055e0260c7..2523673a790 100644 --- a/examples/s2-vite-project/src/Lazy.tsx +++ b/examples/s2-vite-project/src/Lazy.tsx @@ -44,6 +44,7 @@ import { NumberField, Picker, PickerItem, + Popover, ProgressBar, ProgressCircle, Radio, @@ -247,15 +248,15 @@ export default function Lazy() { - + Disk Status - - C:// + + C:// - + 50% disk space remaining. - + diff --git a/examples/s2-webpack-5-example/src/App.js b/examples/s2-webpack-5-example/src/App.js index d2cc185657c..0062e91bfaf 100644 --- a/examples/s2-webpack-5-example/src/App.js +++ b/examples/s2-webpack-5-example/src/App.js @@ -87,7 +87,7 @@ function App() { })} >
- + diff --git a/examples/s2-webpack-5-example/src/Lazy.js b/examples/s2-webpack-5-example/src/Lazy.js index 1004a7eaa0a..bc030012fe3 100644 --- a/examples/s2-webpack-5-example/src/Lazy.js +++ b/examples/s2-webpack-5-example/src/Lazy.js @@ -44,6 +44,7 @@ import { NumberField, Picker, PickerItem, + Popover, ProgressBar, ProgressCircle, Radio, @@ -247,15 +248,15 @@ export default function Lazy() { - + Disk Status - - C:// + + C:// - + 50% disk space remaining. - + From c9f872815261087f7a5b9e403a07c363ba44c583 Mon Sep 17 00:00:00 2001 From: Kyle Taborski Date: Mon, 2 Dec 2024 17:30:01 -0800 Subject: [PATCH 2/3] adding CustomDialog example --- examples/s2-parcel-example/src/Lazy.js | 15 +++++++++++++++ examples/s2-vite-project/src/Lazy.tsx | 15 +++++++++++++++ examples/s2-webpack-5-example/src/Lazy.js | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/examples/s2-parcel-example/src/Lazy.js b/examples/s2-parcel-example/src/Lazy.js index bc030012fe3..d43f33f8cc1 100644 --- a/examples/s2-parcel-example/src/Lazy.js +++ b/examples/s2-parcel-example/src/Lazy.js @@ -13,6 +13,7 @@ import { ButtonGroup, Checkbox, CheckboxGroup, + CloseButton, ColorArea, ColorField, ColorSlider, @@ -23,6 +24,7 @@ import { ComboBoxItem, Content, ContextualHelp, + CustomDialog, Dialog, DialogContainer, DialogTrigger, @@ -68,6 +70,7 @@ import { Tooltip, TooltipTrigger, } from "@react-spectrum/s2"; +import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark'; import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud"; import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload"; import Edit from "@react-spectrum/s2/icons/Edit"; @@ -248,6 +251,18 @@ export default function Lazy() { + + Illustration + +
+ + Thank you! +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

+ +
+
+
+ Disk Status diff --git a/examples/s2-vite-project/src/Lazy.tsx b/examples/s2-vite-project/src/Lazy.tsx index 2523673a790..f15e242ee45 100644 --- a/examples/s2-vite-project/src/Lazy.tsx +++ b/examples/s2-vite-project/src/Lazy.tsx @@ -13,6 +13,7 @@ import { ButtonGroup, Checkbox, CheckboxGroup, + CloseButton, ColorArea, ColorField, ColorSlider, @@ -23,6 +24,7 @@ import { ComboBoxItem, Content, ContextualHelp, + CustomDialog, Dialog, DialogContainer, DialogTrigger, @@ -68,6 +70,7 @@ import { Tooltip, TooltipTrigger, } from "@react-spectrum/s2"; +import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark'; import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud"; import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload"; import Edit from "@react-spectrum/s2/icons/Edit"; @@ -248,6 +251,18 @@ export default function Lazy() { + + Illustration + +
+ + Thank you! +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

+ +
+
+
+ Disk Status diff --git a/examples/s2-webpack-5-example/src/Lazy.js b/examples/s2-webpack-5-example/src/Lazy.js index bc030012fe3..d43f33f8cc1 100644 --- a/examples/s2-webpack-5-example/src/Lazy.js +++ b/examples/s2-webpack-5-example/src/Lazy.js @@ -13,6 +13,7 @@ import { ButtonGroup, Checkbox, CheckboxGroup, + CloseButton, ColorArea, ColorField, ColorSlider, @@ -23,6 +24,7 @@ import { ComboBoxItem, Content, ContextualHelp, + CustomDialog, Dialog, DialogContainer, DialogTrigger, @@ -68,6 +70,7 @@ import { Tooltip, TooltipTrigger, } from "@react-spectrum/s2"; +import Checkmark from '@react-spectrum/s2/illustrations/gradient/generic1/Checkmark'; import Cloud from "@react-spectrum/s2/illustrations/linear/Cloud"; import DropToUpload from "@react-spectrum/s2/illustrations/linear/DropToUpload"; import Edit from "@react-spectrum/s2/icons/Edit"; @@ -248,6 +251,18 @@ export default function Lazy() { + + Illustration + +
+ + Thank you! +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

+ +
+
+
+ Disk Status From d830f32ac52f465c77b457824deae30d953baef2 Mon Sep 17 00:00:00 2001 From: Kyle Taborski Date: Mon, 2 Dec 2024 17:40:12 -0800 Subject: [PATCH 3/3] vw not vh --- examples/s2-parcel-example/src/App.js | 2 +- examples/s2-vite-project/src/App.tsx | 2 +- examples/s2-webpack-5-example/src/App.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/s2-parcel-example/src/App.js b/examples/s2-parcel-example/src/App.js index c7b74c0833a..4f78890c57c 100644 --- a/examples/s2-parcel-example/src/App.js +++ b/examples/s2-parcel-example/src/App.js @@ -87,7 +87,7 @@ function App() { })} >
- + diff --git a/examples/s2-vite-project/src/App.tsx b/examples/s2-vite-project/src/App.tsx index 1f4162034cd..63d2e1e9412 100644 --- a/examples/s2-vite-project/src/App.tsx +++ b/examples/s2-vite-project/src/App.tsx @@ -87,7 +87,7 @@ function App() { })} >
- + diff --git a/examples/s2-webpack-5-example/src/App.js b/examples/s2-webpack-5-example/src/App.js index 0062e91bfaf..797e00db8ea 100644 --- a/examples/s2-webpack-5-example/src/App.js +++ b/examples/s2-webpack-5-example/src/App.js @@ -87,7 +87,7 @@ function App() { })} >
- +