@jcsoftdev/ui 0.2.3 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +288 -7
- package/README.md +2 -1
- package/bin/ui-theme.mjs +1151 -25
- package/dist/ai/attachment/attachment.js +1 -1
- package/dist/ai/chat-list/group.js +3 -1
- package/dist/ai/conversation/conversation.js +1 -1
- package/dist/ai/internal/use-copy.d.ts +1 -5
- package/dist/ai/internal/use-copy.js +1 -32
- package/dist/ai/markdown/parse.js +59 -17
- package/dist/ai/source/source.js +1 -1
- package/dist/atoms/avatar/avatar.d.ts +13 -3
- package/dist/atoms/avatar/avatar.js +40 -2
- package/dist/atoms/avatar/index.d.ts +1 -1
- package/dist/atoms/avatar/index.js +3 -1
- package/dist/atoms/button/button.d.ts +4 -1
- package/dist/atoms/button/button.js +4 -2
- package/dist/atoms/checkbox/checkbox.d.ts +8 -3
- package/dist/atoms/checkbox/checkbox.js +23 -2
- package/dist/atoms/chip/chip.d.ts +9 -3
- package/dist/atoms/chip/chip.js +26 -4
- package/dist/atoms/chip/index.d.ts +1 -1
- package/dist/atoms/chip/index.js +4 -1
- package/dist/atoms/status-dot/index.d.ts +1 -1
- package/dist/atoms/status-dot/status-dot.d.ts +4 -2
- package/dist/atoms/status-dot/status-dot.js +5 -1
- package/dist/charts/bar-chart/bar-race-chart.js +1 -0
- package/dist/charts/beeswarm-chart/beeswarm-chart.js +1 -1
- package/dist/charts/chord-chart/chord-chart.js +13 -5
- package/dist/charts/core/cartesian/cartesian-chart.d.ts +1 -1
- package/dist/charts/core/cartesian/cartesian-chart.js +48 -11
- package/dist/charts/core/cartesian/layout.d.ts +6 -1
- package/dist/charts/core/cartesian/layout.js +14 -5
- package/dist/charts/core/cartesian/marks.d.ts +2 -2
- package/dist/charts/core/cartesian/marks.js +1 -1
- package/dist/charts/core/cartesian/types.d.ts +28 -2
- package/dist/charts/core/category-explorer.d.ts +2 -2
- package/dist/charts/core/category-explorer.js +8 -4
- package/dist/charts/core/chart-dock.d.ts +26 -0
- package/dist/charts/core/chart-dock.js +45 -0
- package/dist/charts/core/chart-frame.d.ts +9 -2
- package/dist/charts/core/chart-frame.js +105 -25
- package/dist/charts/core/distribution/explorer.d.ts +5 -2
- package/dist/charts/core/distribution/explorer.js +12 -5
- package/dist/charts/core/distribution/xy-points.js +1 -1
- package/dist/charts/core/index.d.ts +3 -0
- package/dist/charts/core/index.js +3 -0
- package/dist/charts/core/leave-grace.d.ts +11 -0
- package/dist/charts/core/leave-grace.js +26 -0
- package/dist/charts/core/nearest.d.ts +14 -0
- package/dist/charts/core/nearest.js +22 -0
- package/dist/charts/core/plot-overlay.js +9 -3
- package/dist/charts/core/pointer.test-utils.d.ts +38 -0
- package/dist/charts/core/pointer.test-utils.js +123 -0
- package/dist/charts/core/tooltip.d.ts +25 -2
- package/dist/charts/core/tooltip.js +115 -40
- package/dist/charts/core/touch-select.d.ts +20 -0
- package/dist/charts/core/touch-select.js +184 -0
- package/dist/charts/core/types.d.ts +8 -4
- package/dist/charts/core/types.js +5 -0
- package/dist/charts/core/use-index-navigation.d.ts +17 -6
- package/dist/charts/core/use-index-navigation.js +47 -10
- package/dist/charts/donut-chart/donut-chart.d.ts +5 -1
- package/dist/charts/donut-chart/donut-chart.js +40 -1
- package/dist/charts/donut-chart/slice-labels.d.ts +20 -0
- package/dist/charts/donut-chart/slice-labels.js +20 -0
- package/dist/charts/dumbbell-chart/dumbbell-chart.js +6 -3
- package/dist/charts/fill-gauge-chart/fill-gauge-chart.js +1 -0
- package/dist/charts/funnel-chart/funnel-chart.js +2 -1
- package/dist/charts/gauge-chart/gauge-chart.js +2 -1
- package/dist/charts/heatmap-chart/heatmap-chart.d.ts +4 -1
- package/dist/charts/heatmap-chart/heatmap-chart.js +3 -1
- package/dist/charts/heatmap-chart/heatmap-grid.d.ts +4 -1
- package/dist/charts/heatmap-chart/heatmap-grid.js +3 -1
- package/dist/charts/hex-tile-map/hex-tile-map.js +124 -115
- package/dist/charts/hierarchy-morph/hierarchy-morph.js +2 -1
- package/dist/charts/icicle-chart/icicle-chart.js +7 -9
- package/dist/charts/lollipop-chart/lollipop-chart.js +6 -3
- package/dist/charts/maps/geo/map-viewport.js +1 -1
- package/dist/charts/polar-area-chart/polar-area-chart.js +42 -12
- package/dist/charts/progress-units/progress-units.js +1 -0
- package/dist/charts/radar-chart/radar-chart.js +1 -1
- package/dist/charts/radial-bar-chart/radial-bar-chart.js +2 -1
- package/dist/charts/range-area-chart/range-area-chart.js +3 -2
- package/dist/charts/sankey-chart/sankey-chart.js +12 -4
- package/dist/charts/tree-chart/tree-chart.js +1 -0
- package/dist/charts/treemap-chart/treemap-chart.js +2 -7
- package/dist/charts/waterfall-chart/waterfall-chart.js +6 -3
- package/dist/containers/action-bar/action-bar.d.ts +11 -2
- package/dist/containers/action-bar/action-bar.js +4 -1
- package/dist/containers/card/card.d.ts +21 -3
- package/dist/containers/card/card.js +20 -5
- package/dist/containers/grid/grid.d.ts +15 -0
- package/dist/containers/grid/grid.js +24 -0
- package/dist/containers/grid/index.d.ts +1 -0
- package/dist/containers/grid/index.js +4 -0
- package/dist/containers/index.d.ts +3 -0
- package/dist/containers/index.js +3 -0
- package/dist/containers/kpi/kpi.d.ts +13 -2
- package/dist/containers/kpi/kpi.js +86 -24
- package/dist/containers/kpi-group/index.d.ts +1 -1
- package/dist/containers/kpi-group/index.js +3 -1
- package/dist/containers/kpi-group/kpi-group.d.ts +9 -1
- package/dist/containers/kpi-group/kpi-group.js +11 -1
- package/dist/containers/page/index.d.ts +1 -0
- package/dist/containers/page/index.js +4 -0
- package/dist/containers/page/page.d.ts +7 -0
- package/dist/containers/page/page.js +14 -0
- package/dist/containers/page-header/page-header.d.ts +8 -3
- package/dist/containers/page-header/page-header.js +35 -8
- package/dist/containers/responsive-list/responsive-list.d.ts +1 -1
- package/dist/containers/responsive-list/responsive-list.js +6 -3
- package/dist/containers/stack/index.d.ts +1 -0
- package/dist/containers/stack/index.js +6 -0
- package/dist/containers/stack/stack.d.ts +15 -0
- package/dist/containers/stack/stack.js +43 -0
- package/dist/forms/copy-field/copy-field.d.ts +17 -0
- package/dist/forms/copy-field/copy-field.js +72 -0
- package/dist/forms/copy-field/index.d.ts +1 -0
- package/dist/forms/copy-field/index.js +4 -0
- package/dist/forms/emoji-picker/emoji-picker.js +1 -1
- package/dist/forms/form/form.d.ts +15 -0
- package/dist/forms/form/form.js +29 -0
- package/dist/forms/form/index.d.ts +1 -0
- package/dist/forms/form/index.js +10 -0
- package/dist/forms/index.d.ts +2 -0
- package/dist/forms/index.js +2 -0
- package/dist/forms/input/index.d.ts +1 -1
- package/dist/forms/input/index.js +3 -2
- package/dist/forms/input/input.d.ts +6 -2
- package/dist/forms/input/input.js +9 -3
- package/dist/glass/crystal-map.d.ts +70 -0
- package/dist/glass/crystal-map.js +88 -0
- package/dist/glass/displacement-map.d.ts +117 -0
- package/dist/glass/displacement-map.js +201 -0
- package/dist/glass/index.d.ts +8 -0
- package/dist/glass/index.js +63 -0
- package/dist/glass/lens-crystal.d.ts +29 -0
- package/dist/glass/lens-crystal.js +161 -0
- package/dist/glass/lens-dispersion.d.ts +11 -0
- package/dist/glass/lens-dispersion.js +19 -0
- package/dist/glass/liquid-glass.d.ts +41 -0
- package/dist/glass/liquid-glass.js +256 -0
- package/dist/glass/liquid-motion.d.ts +53 -0
- package/dist/glass/liquid-motion.js +302 -0
- package/dist/glass/liquid-options.d.ts +162 -0
- package/dist/glass/liquid-options.js +179 -0
- package/dist/glass/refraction.d.ts +100 -0
- package/dist/glass/refraction.js +714 -0
- package/dist/glass/specular-map.d.ts +26 -0
- package/dist/glass/specular-map.js +75 -0
- package/dist/glass/spring.d.ts +79 -0
- package/dist/glass/spring.js +58 -0
- package/dist/glass/support.d.ts +13 -0
- package/dist/glass/support.js +14 -0
- package/dist/glass/use-glass-refraction.d.ts +8 -0
- package/dist/glass/use-glass-refraction.js +16 -0
- package/dist/i18n/strings.d.ts +24 -0
- package/dist/i18n/strings.js +18 -2
- package/dist/icons/index.d.ts +2 -0
- package/dist/icons/index.js +4 -0
- package/dist/icons/key.d.ts +2 -0
- package/dist/icons/key.js +12 -0
- package/dist/icons/webhook.d.ts +2 -0
- package/dist/icons/webhook.js +12 -0
- package/dist/liquid/index.d.ts +3 -0
- package/dist/liquid/index.js +29 -0
- package/dist/navigation/breadcrumbs/breadcrumbs.d.ts +29 -0
- package/dist/navigation/breadcrumbs/breadcrumbs.js +70 -0
- package/dist/navigation/breadcrumbs/index.d.ts +1 -0
- package/dist/navigation/breadcrumbs/index.js +6 -0
- package/dist/navigation/index.d.ts +1 -0
- package/dist/navigation/index.js +1 -0
- package/dist/navigation/segmented/index.d.ts +1 -1
- package/dist/navigation/segmented/model.d.ts +5 -0
- package/dist/navigation/segmented/model.js +6 -0
- package/dist/navigation/segmented/segmented.d.ts +17 -3
- package/dist/navigation/segmented/segmented.js +20 -4
- package/dist/overlays/context-menu/context-menu.d.ts +9 -1
- package/dist/overlays/context-menu/context-menu.js +4 -1
- package/dist/overlays/dialog/dialog.d.ts +9 -1
- package/dist/overlays/dialog/dialog.js +3 -0
- package/dist/overlays/drawer/drawer.d.ts +9 -1
- package/dist/overlays/drawer/drawer.js +3 -0
- package/dist/overlays/dropdown-menu/dropdown-menu.d.ts +9 -1
- package/dist/overlays/dropdown-menu/dropdown-menu.js +3 -1
- package/dist/overlays/hover-card/hover-card.d.ts +10 -1
- package/dist/overlays/hover-card/hover-card.js +4 -1
- package/dist/overlays/popover/popover.d.ts +9 -1
- package/dist/overlays/popover/popover.js +3 -0
- package/dist/palette/command-palette/command-palette.d.ts +12 -2
- package/dist/palette/command-palette/command-palette.js +5 -0
- package/dist/primitives/command/command.d.ts +3 -2
- package/dist/primitives/command/command.js +2 -0
- package/dist/primitives/menu/menu.js +1 -1
- package/dist/primitives/popper/popper.js +5 -0
- package/dist/rich-text/rich-text-editor.js +94 -8
- package/dist/rich-text/sanitize.js +70 -20
- package/dist/shell/app-shell/app-shell.d.ts +17 -0
- package/dist/shell/app-shell/app-shell.js +44 -4
- package/dist/shell/bottom-nav/bottom-nav.d.ts +34 -0
- package/dist/shell/bottom-nav/bottom-nav.js +124 -0
- package/dist/shell/bottom-nav/index.d.ts +2 -0
- package/dist/shell/bottom-nav/index.js +9 -0
- package/dist/shell/bottom-nav/split.d.ts +11 -0
- package/dist/shell/bottom-nav/split.js +10 -0
- package/dist/shell/sidebar/sidebar.d.ts +16 -2
- package/dist/shell/sidebar/sidebar.js +46 -4
- package/dist/shell/topbar/topbar.d.ts +20 -9
- package/dist/shell/topbar/topbar.js +16 -9
- package/dist/states/empty-state/empty-state.d.ts +3 -1
- package/dist/states/empty-state/empty-state.js +9 -1
- package/dist/states/error-state/error-state.d.ts +3 -1
- package/dist/states/error-state/error-state.js +2 -0
- package/dist/states/index.d.ts +1 -0
- package/dist/states/index.js +1 -0
- package/dist/states/live-status-bar/index.d.ts +1 -0
- package/dist/states/live-status-bar/index.js +6 -0
- package/dist/states/live-status-bar/live-status-bar.d.ts +17 -0
- package/dist/states/live-status-bar/live-status-bar.js +49 -0
- package/dist/states/offline-banner/offline-banner.d.ts +3 -1
- package/dist/states/offline-banner/offline-banner.js +8 -4
- package/dist/utils/class-groups.js +17 -0
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.js +2 -0
- package/dist/utils/material.d.ts +13 -0
- package/dist/utils/material.js +6 -0
- package/dist/utils/tone.d.ts +8 -0
- package/dist/utils/tone.js +17 -0
- package/dist/utils/use-copy.d.ts +5 -0
- package/dist/utils/use-copy.js +35 -0
- package/icons/svg/key.svg +5 -0
- package/icons/svg/webhook.svg +5 -0
- package/package.json +31 -21
- package/scripts/build-theme.d.mts +22 -0
- package/scripts/build-theme.mjs +236 -4
- package/src/ai/attachment/attachment.tsx +1 -1
- package/src/ai/chat-list/group.ts +3 -1
- package/src/ai/conversation/conversation.tsx +1 -1
- package/src/ai/internal/use-copy.ts +1 -38
- package/src/ai/markdown/parse.ts +74 -17
- package/src/ai/source/source.tsx +1 -1
- package/src/atoms/avatar/avatar.tsx +57 -4
- package/src/atoms/avatar/index.ts +8 -1
- package/src/atoms/button/button.tsx +8 -3
- package/src/atoms/checkbox/checkbox.tsx +30 -3
- package/src/atoms/chip/chip.tsx +37 -5
- package/src/atoms/chip/index.ts +7 -1
- package/src/atoms/status-dot/index.ts +1 -0
- package/src/atoms/status-dot/status-dot.tsx +15 -3
- package/src/charts/README.md +21 -0
- package/src/charts/bar-chart/bar-race-chart.tsx +1 -0
- package/src/charts/beeswarm-chart/beeswarm-chart.tsx +1 -1
- package/src/charts/chord-chart/chord-chart.tsx +13 -5
- package/src/charts/core/cartesian/cartesian-chart.tsx +55 -10
- package/src/charts/core/cartesian/layout.ts +29 -10
- package/src/charts/core/cartesian/marks.tsx +3 -3
- package/src/charts/core/cartesian/types.ts +30 -2
- package/src/charts/core/category-explorer.tsx +12 -6
- package/src/charts/core/chart-dock.tsx +68 -0
- package/src/charts/core/chart-frame.tsx +116 -27
- package/src/charts/core/distribution/explorer.tsx +17 -7
- package/src/charts/core/distribution/xy-points.tsx +1 -1
- package/src/charts/core/index.ts +3 -0
- package/src/charts/core/leave-grace.ts +35 -0
- package/src/charts/core/nearest.ts +38 -0
- package/src/charts/core/plot-overlay.tsx +9 -3
- package/src/charts/core/pointer.test-utils.ts +146 -0
- package/src/charts/core/tooltip.tsx +129 -15
- package/src/charts/core/touch-select.ts +250 -0
- package/src/charts/core/types.ts +13 -4
- package/src/charts/core/use-index-navigation.ts +70 -11
- package/src/charts/donut-chart/donut-chart.tsx +53 -3
- package/src/charts/donut-chart/slice-labels.ts +39 -0
- package/src/charts/dumbbell-chart/dumbbell-chart.tsx +8 -3
- package/src/charts/fill-gauge-chart/fill-gauge-chart.tsx +1 -0
- package/src/charts/funnel-chart/funnel-chart.tsx +2 -1
- package/src/charts/gauge-chart/gauge-chart.tsx +2 -1
- package/src/charts/heatmap-chart/heatmap-chart.tsx +5 -0
- package/src/charts/heatmap-chart/heatmap-grid.tsx +5 -1
- package/src/charts/hex-tile-map/hex-tile-map.tsx +6 -1
- package/src/charts/hierarchy-morph/hierarchy-morph.tsx +2 -1
- package/src/charts/icicle-chart/icicle-chart.tsx +8 -9
- package/src/charts/lollipop-chart/lollipop-chart.tsx +8 -3
- package/src/charts/maps/geo/map-viewport.tsx +1 -1
- package/src/charts/polar-area-chart/polar-area-chart.tsx +37 -12
- package/src/charts/progress-units/progress-units.tsx +1 -0
- package/src/charts/radar-chart/radar-chart.tsx +1 -1
- package/src/charts/radial-bar-chart/radial-bar-chart.tsx +2 -1
- package/src/charts/range-area-chart/range-area-chart.tsx +3 -2
- package/src/charts/sankey-chart/sankey-chart.tsx +12 -4
- package/src/charts/tree-chart/tree-chart.tsx +1 -0
- package/src/charts/treemap-chart/treemap-chart.tsx +2 -7
- package/src/charts/waterfall-chart/waterfall-chart.tsx +8 -3
- package/src/containers/action-bar/action-bar.tsx +13 -2
- package/src/containers/card/card.tsx +43 -4
- package/src/containers/grid/grid.tsx +37 -0
- package/src/containers/grid/index.ts +1 -0
- package/src/containers/index.ts +3 -0
- package/src/containers/kpi/kpi.tsx +116 -22
- package/src/containers/kpi-group/index.ts +7 -1
- package/src/containers/kpi-group/kpi-group.tsx +26 -1
- package/src/containers/page/index.ts +1 -0
- package/src/containers/page/page.tsx +17 -0
- package/src/containers/page-header/page-header.tsx +38 -8
- package/src/containers/responsive-list/responsive-list.tsx +7 -4
- package/src/containers/stack/index.ts +7 -0
- package/src/containers/stack/stack.tsx +55 -0
- package/src/forms/copy-field/copy-field.tsx +88 -0
- package/src/forms/copy-field/index.ts +1 -0
- package/src/forms/emoji-picker/emoji-picker.tsx +1 -1
- package/src/forms/form/form.tsx +46 -0
- package/src/forms/form/index.ts +8 -0
- package/src/forms/index.ts +2 -0
- package/src/forms/input/index.ts +1 -1
- package/src/forms/input/input.tsx +14 -3
- package/src/glass/crystal-map.ts +150 -0
- package/src/glass/displacement-map.ts +317 -0
- package/src/glass/index.ts +43 -0
- package/src/glass/lens-crystal.ts +226 -0
- package/src/glass/lens-dispersion.ts +34 -0
- package/src/glass/liquid-glass.tsx +371 -0
- package/src/glass/liquid-motion.ts +395 -0
- package/src/glass/liquid-options.ts +306 -0
- package/src/glass/refraction.ts +1010 -0
- package/src/glass/specular-map.ts +95 -0
- package/src/glass/spring.ts +98 -0
- package/src/glass/support.ts +27 -0
- package/src/glass/use-glass-refraction.ts +21 -0
- package/src/i18n/strings.ts +24 -0
- package/src/icons/index.ts +2 -0
- package/src/icons/key.tsx +13 -0
- package/src/icons/webhook.tsx +13 -0
- package/src/liquid/index.ts +24 -0
- package/src/navigation/breadcrumbs/breadcrumbs.tsx +103 -0
- package/src/navigation/breadcrumbs/index.ts +8 -0
- package/src/navigation/index.ts +1 -0
- package/src/navigation/segmented/index.ts +1 -0
- package/src/navigation/segmented/model.ts +11 -0
- package/src/navigation/segmented/segmented.tsx +45 -6
- package/src/overlays/context-menu/context-menu.tsx +11 -1
- package/src/overlays/dialog/dialog.tsx +10 -0
- package/src/overlays/drawer/drawer.tsx +10 -0
- package/src/overlays/dropdown-menu/dropdown-menu.tsx +10 -1
- package/src/overlays/hover-card/hover-card.tsx +12 -1
- package/src/overlays/popover/popover.tsx +10 -0
- package/src/palette/command-palette/command-palette.tsx +15 -1
- package/src/primitives/command/command.tsx +4 -0
- package/src/primitives/menu/menu.tsx +1 -1
- package/src/primitives/popper/popper.tsx +10 -0
- package/src/rich-text/rich-text-editor.tsx +116 -13
- package/src/rich-text/sanitize.ts +94 -23
- package/src/shell/app-shell/app-shell.tsx +60 -4
- package/src/shell/bottom-nav/bottom-nav.tsx +187 -0
- package/src/shell/bottom-nav/index.ts +8 -0
- package/src/shell/bottom-nav/split.ts +20 -0
- package/src/shell/sidebar/sidebar.tsx +51 -5
- package/src/shell/topbar/topbar.tsx +81 -58
- package/src/states/empty-state/empty-state.tsx +11 -1
- package/src/states/error-state/error-state.tsx +4 -0
- package/src/states/index.ts +1 -0
- package/src/states/live-status-bar/index.ts +6 -0
- package/src/states/live-status-bar/live-status-bar.tsx +62 -0
- package/src/states/offline-banner/offline-banner.tsx +13 -5
- package/src/utils/class-groups.ts +17 -0
- package/src/utils/index.ts +1 -0
- package/src/utils/material.ts +16 -0
- package/src/utils/tone.ts +29 -0
- package/src/utils/use-copy.ts +38 -0
- package/styles/Theme.kt +64 -3
- package/styles/base.css +51 -0
- package/styles/tailwind.css +833 -0
- package/styles/theme.css +546 -4
- package/styles/tokens.css +788 -15
- package/tokens/default.json +918 -29
- package/scripts/build-theme.d.ts +0 -18
|
@@ -6,6 +6,7 @@ import { X } from "../../icons/index.js";
|
|
|
6
6
|
import * as DialogPrimitive from "../../primitives/dialog/dialog.js";
|
|
7
7
|
import type { ClassNames } from "../../utils/class-names.js";
|
|
8
8
|
import { cn } from "../../utils/cn.js";
|
|
9
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
9
10
|
import {
|
|
10
11
|
PreviousFocusProvider,
|
|
11
12
|
restoreFocusOnClose,
|
|
@@ -42,6 +43,13 @@ export interface DialogContentProps extends DialogPrimitive.DialogContentProps {
|
|
|
42
43
|
/** Per-part classes merged with `cn`; consumer classes win. `className` still targets the content and is merged last. */
|
|
43
44
|
classNames?: ClassNames<DialogContentPart>;
|
|
44
45
|
width?: DialogWidth;
|
|
46
|
+
/**
|
|
47
|
+
* Surface material. Omitted keeps the default for this layer; `"glass"` and `"glass-clear"`
|
|
48
|
+
* are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its fallbacks), `"solid"`
|
|
49
|
+
* forces an opaque surface. Liquid options go in `style` (`liquidStyle()` from
|
|
50
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
51
|
+
*/
|
|
52
|
+
material?: Material;
|
|
45
53
|
/**
|
|
46
54
|
* While a mutation is in flight: `Escape`, outside click and the close button
|
|
47
55
|
* are disabled so half-saved state is not lost.
|
|
@@ -57,6 +65,7 @@ export function DialogContent({
|
|
|
57
65
|
className,
|
|
58
66
|
classNames,
|
|
59
67
|
width = "md",
|
|
68
|
+
material,
|
|
60
69
|
blocking = false,
|
|
61
70
|
closeLabel,
|
|
62
71
|
container,
|
|
@@ -76,6 +85,7 @@ export function DialogContent({
|
|
|
76
85
|
className={cn(
|
|
77
86
|
"@container/dialog fixed top-[9dvh] left-1/2 z-70 flex max-h-[84dvh] max-w-full -translate-x-1/2 flex-col overflow-auto rounded-dialog outline-none surface-overlay shadow-overlay",
|
|
78
87
|
widthClasses[width],
|
|
88
|
+
materialClass(material, "surface-solid"),
|
|
79
89
|
classNames?.root,
|
|
80
90
|
className,
|
|
81
91
|
)}
|
|
@@ -6,6 +6,7 @@ import { X } from "../../icons/index.js";
|
|
|
6
6
|
import * as DialogPrimitive from "../../primitives/dialog/dialog.js";
|
|
7
7
|
import type { ClassNames } from "../../utils/class-names.js";
|
|
8
8
|
import { cn } from "../../utils/cn.js";
|
|
9
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
9
10
|
import {
|
|
10
11
|
PreviousFocusProvider,
|
|
11
12
|
restoreFocusOnClose,
|
|
@@ -46,6 +47,13 @@ export type DrawerContentPart = "root" | "overlay" | "close";
|
|
|
46
47
|
export interface DrawerContentProps extends DialogPrimitive.DialogContentProps {
|
|
47
48
|
/** Per-part classes merged with `cn`; consumer classes win. `className` still targets the content and is merged last. */
|
|
48
49
|
classNames?: ClassNames<DrawerContentPart>;
|
|
50
|
+
/**
|
|
51
|
+
* Surface material. Omitted keeps the default for this layer; `"glass"` and `"glass-clear"`
|
|
52
|
+
* are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its fallbacks), `"solid"`
|
|
53
|
+
* forces an opaque surface. Liquid options go in `style` (`liquidStyle()` from
|
|
54
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
55
|
+
*/
|
|
56
|
+
material?: Material;
|
|
49
57
|
/** Same semantics as `DialogContentProps.blocking`. */
|
|
50
58
|
blocking?: boolean;
|
|
51
59
|
/** Accessible label of the close button. */
|
|
@@ -56,6 +64,7 @@ export interface DrawerContentProps extends DialogPrimitive.DialogContentProps {
|
|
|
56
64
|
export function DrawerContent({
|
|
57
65
|
className,
|
|
58
66
|
classNames,
|
|
67
|
+
material,
|
|
59
68
|
blocking = false,
|
|
60
69
|
closeLabel,
|
|
61
70
|
children,
|
|
@@ -73,6 +82,7 @@ export function DrawerContent({
|
|
|
73
82
|
<DialogPrimitive.Content
|
|
74
83
|
className={cn(
|
|
75
84
|
"@container/drawer fixed inset-y-0 right-0 z-70 flex h-full w-[min(430px,100%)] max-w-full flex-col overflow-y-auto outline-none surface-overlay shadow-overlay",
|
|
85
|
+
materialClass(material, "surface-solid"),
|
|
76
86
|
classNames?.root,
|
|
77
87
|
className,
|
|
78
88
|
)}
|
|
@@ -4,6 +4,7 @@ import type { ComponentPropsWithoutRef, HTMLAttributes } from "react";
|
|
|
4
4
|
import { Check, ChevronRight } from "../../icons/index.js";
|
|
5
5
|
import * as MenuPrimitive from "../../primitives/menu/menu.js";
|
|
6
6
|
import { cn } from "../../utils/cn.js";
|
|
7
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
7
8
|
|
|
8
9
|
export const DropdownMenu = MenuPrimitive.Root;
|
|
9
10
|
export const DropdownMenuTrigger = MenuPrimitive.Trigger;
|
|
@@ -21,6 +22,13 @@ const itemBase =
|
|
|
21
22
|
export interface DropdownMenuContentProps extends MenuPrimitive.MenuContentProps {
|
|
22
23
|
/** Portal target. Defaults to `document.body`; pass an element to keep a scoped `data-style`. */
|
|
23
24
|
container?: HTMLElement | null;
|
|
25
|
+
/**
|
|
26
|
+
* Surface material. Omitted keeps the default for this layer; `"glass"` and `"glass-clear"`
|
|
27
|
+
* are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its fallbacks), `"solid"`
|
|
28
|
+
* forces an opaque surface. Liquid options go in `style` (`liquidStyle()` from
|
|
29
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
30
|
+
*/
|
|
31
|
+
material?: Material;
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
export function DropdownMenuContent({
|
|
@@ -28,6 +36,7 @@ export function DropdownMenuContent({
|
|
|
28
36
|
sideOffset = 6,
|
|
29
37
|
collisionPadding = 8,
|
|
30
38
|
container,
|
|
39
|
+
material,
|
|
31
40
|
...props
|
|
32
41
|
}: DropdownMenuContentProps) {
|
|
33
42
|
return (
|
|
@@ -35,7 +44,7 @@ export function DropdownMenuContent({
|
|
|
35
44
|
<MenuPrimitive.Content
|
|
36
45
|
sideOffset={sideOffset}
|
|
37
46
|
collisionPadding={collisionPadding}
|
|
38
|
-
className={cn(surface, className)}
|
|
47
|
+
className={cn(surface, materialClass(material, "surface-solid"), className)}
|
|
39
48
|
{...props}
|
|
40
49
|
/>
|
|
41
50
|
</MenuPrimitive.Portal>
|
|
@@ -16,6 +16,7 @@ import {
|
|
|
16
16
|
} from "react";
|
|
17
17
|
import * as PopoverPrimitive from "../../primitives/popover/popover.js";
|
|
18
18
|
import { cn } from "../../utils/cn.js";
|
|
19
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
19
20
|
import { Slot } from "../../utils/slot.js";
|
|
20
21
|
|
|
21
22
|
interface HoverCardContextValue {
|
|
@@ -141,6 +142,14 @@ export interface HoverCardContentProps
|
|
|
141
142
|
extends Omit<PopoverPrimitive.PopoverContentProps, "onOpenAutoFocus"> {
|
|
142
143
|
/** Portal target. Defaults to `document.body`; pass an element to keep a scoped `data-style`. */
|
|
143
144
|
container?: HTMLElement | null;
|
|
145
|
+
/**
|
|
146
|
+
* Surface material. Omitted keeps the overlay surface (`surface-overlay`: glass in the `glass`
|
|
147
|
+
* preset, opaque elsewhere); `"solid"` forces the opaque `surface-solid` fill; `"glass"` and
|
|
148
|
+
* `"glass-clear"` are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its
|
|
149
|
+
* fallbacks). Liquid options go in `style` (`liquidStyle()` from
|
|
150
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
151
|
+
*/
|
|
152
|
+
material?: Material;
|
|
144
153
|
}
|
|
145
154
|
|
|
146
155
|
export function HoverCardContent({
|
|
@@ -151,6 +160,7 @@ export function HoverCardContent({
|
|
|
151
160
|
onMouseLeave,
|
|
152
161
|
onCloseAutoFocus,
|
|
153
162
|
container,
|
|
163
|
+
material,
|
|
154
164
|
...props
|
|
155
165
|
}: HoverCardContentProps) {
|
|
156
166
|
const card = useHoverCard();
|
|
@@ -176,7 +186,8 @@ export function HoverCardContent({
|
|
|
176
186
|
card.schedule(false, card.closeDelay);
|
|
177
187
|
}}
|
|
178
188
|
className={cn(
|
|
179
|
-
"z-85 w-72 max-w-(--ui-popper-available-width) rounded-popover border-card surface-overlay
|
|
189
|
+
"z-85 w-72 max-w-(--ui-popper-available-width) rounded-popover border-card surface-overlay p-card text-body text-ink shadow-overlay",
|
|
190
|
+
materialClass(material, "surface-solid"),
|
|
180
191
|
className,
|
|
181
192
|
)}
|
|
182
193
|
{...props}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import * as PopoverPrimitive from "../../primitives/popover/popover.js";
|
|
4
4
|
import { cn } from "../../utils/cn.js";
|
|
5
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
5
6
|
|
|
6
7
|
export const Popover = PopoverPrimitive.Root;
|
|
7
8
|
export const PopoverTrigger = PopoverPrimitive.Trigger;
|
|
@@ -12,6 +13,13 @@ export const PopoverArrow = PopoverPrimitive.Arrow;
|
|
|
12
13
|
export interface PopoverContentProps extends PopoverPrimitive.PopoverContentProps {
|
|
13
14
|
/** Portal target. Defaults to `document.body`; pass an element to keep a scoped `data-style`. */
|
|
14
15
|
container?: HTMLElement | null;
|
|
16
|
+
/**
|
|
17
|
+
* Surface material. Omitted keeps the default for this layer; `"glass"` and `"glass-clear"`
|
|
18
|
+
* are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its fallbacks), `"solid"`
|
|
19
|
+
* forces an opaque surface. Liquid options go in `style` (`liquidStyle()` from
|
|
20
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
21
|
+
*/
|
|
22
|
+
material?: Material;
|
|
15
23
|
}
|
|
16
24
|
|
|
17
25
|
/** Positioned contextual panel; flips and shifts to stay inside the viewport. */
|
|
@@ -20,6 +28,7 @@ export function PopoverContent({
|
|
|
20
28
|
sideOffset = 6,
|
|
21
29
|
collisionPadding = 8,
|
|
22
30
|
container,
|
|
31
|
+
material,
|
|
23
32
|
...props
|
|
24
33
|
}: PopoverContentProps) {
|
|
25
34
|
return (
|
|
@@ -29,6 +38,7 @@ export function PopoverContent({
|
|
|
29
38
|
collisionPadding={collisionPadding}
|
|
30
39
|
className={cn(
|
|
31
40
|
"z-85 min-w-[min(14.375rem,var(--ui-popper-available-width))] max-h-(--ui-popper-available-height) max-w-(--ui-popper-available-width) overflow-y-auto rounded-popover surface-overlay p-1.5 text-ink shadow-overlay",
|
|
41
|
+
materialClass(material, "surface-solid"),
|
|
32
42
|
className,
|
|
33
43
|
)}
|
|
34
44
|
{...props}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use client";
|
|
2
2
|
|
|
3
|
-
import type { ReactNode } from "react";
|
|
3
|
+
import type { CSSProperties, ReactNode } from "react";
|
|
4
4
|
import { Search } from "../../icons/index.js";
|
|
5
5
|
import * as Command from "../../primitives/command/command.js";
|
|
6
6
|
import type { ClassNames } from "../../utils/class-names.js";
|
|
7
7
|
import { cn } from "../../utils/cn.js";
|
|
8
|
+
import { type Material, materialClass } from "../../utils/material.js";
|
|
8
9
|
|
|
9
10
|
export interface CommandPaletteItem {
|
|
10
11
|
id: string;
|
|
@@ -48,7 +49,16 @@ export interface CommandPaletteProps {
|
|
|
48
49
|
/** Controlled query, so the parent can react to typing (e.g. debounced remote search). */
|
|
49
50
|
query?: string;
|
|
50
51
|
onQueryChange?: (query: string) => void;
|
|
52
|
+
/**
|
|
53
|
+
* Surface material. Omitted keeps the default for this layer; `"glass"` and `"glass-clear"`
|
|
54
|
+
* are frosted glass, `"liquid"` and `"liquid-clear"` Liquid Glass (with its fallbacks), `"solid"`
|
|
55
|
+
* forces an opaque surface. Liquid options go in `style` (`liquidStyle()` from
|
|
56
|
+
* `@jcsoftdev/ui/liquid`); the lens needs `<LiquidGlass />` mounted once.
|
|
57
|
+
*/
|
|
58
|
+
material?: Material;
|
|
51
59
|
className?: string;
|
|
60
|
+
/** Inline style of the root (for example `liquidStyle()` options). */
|
|
61
|
+
style?: CSSProperties;
|
|
52
62
|
/** Per-part classes merged with `cn`; consumer classes win. `className` still targets the root and is merged last. */
|
|
53
63
|
classNames?: ClassNames<CommandPalettePart>;
|
|
54
64
|
}
|
|
@@ -84,7 +94,9 @@ export function CommandPalette({
|
|
|
84
94
|
closeKeyLabel = "Esc",
|
|
85
95
|
query,
|
|
86
96
|
onQueryChange,
|
|
97
|
+
material,
|
|
87
98
|
className,
|
|
99
|
+
style,
|
|
88
100
|
classNames,
|
|
89
101
|
}: CommandPaletteProps) {
|
|
90
102
|
return (
|
|
@@ -97,9 +109,11 @@ export function CommandPalette({
|
|
|
97
109
|
overlayClassName={cn("fixed inset-0 z-50 bg-scrim", classNames?.overlay)}
|
|
98
110
|
contentClassName={cn(
|
|
99
111
|
"@container/palette fixed top-[9vh] left-1/2 z-50 flex max-h-[70vh] w-[min(560px,calc(100vw-1rem))] -translate-x-1/2 flex-col overflow-hidden rounded-dialog surface-overlay shadow-overlay",
|
|
112
|
+
materialClass(material, "surface-solid"),
|
|
100
113
|
classNames?.root,
|
|
101
114
|
className,
|
|
102
115
|
)}
|
|
116
|
+
contentStyle={style}
|
|
103
117
|
>
|
|
104
118
|
<div
|
|
105
119
|
className={cn(
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import {
|
|
4
4
|
type ChangeEvent,
|
|
5
5
|
type ComponentProps,
|
|
6
|
+
type CSSProperties,
|
|
6
7
|
createContext,
|
|
7
8
|
type KeyboardEvent as ReactKeyboardEvent,
|
|
8
9
|
type ReactNode,
|
|
@@ -572,6 +573,7 @@ export interface CommandDialogProps extends CommandRootProps {
|
|
|
572
573
|
container?: HTMLElement | null;
|
|
573
574
|
overlayClassName?: string;
|
|
574
575
|
contentClassName?: string;
|
|
576
|
+
contentStyle?: CSSProperties;
|
|
575
577
|
onOpenAutoFocus?: (event: Event) => void;
|
|
576
578
|
onCloseAutoFocus?: (event: Event) => void;
|
|
577
579
|
onEscapeKeyDown?: (event: KeyboardEvent) => void;
|
|
@@ -584,6 +586,7 @@ export function Dialog({
|
|
|
584
586
|
container,
|
|
585
587
|
overlayClassName,
|
|
586
588
|
contentClassName,
|
|
589
|
+
contentStyle,
|
|
587
590
|
onOpenAutoFocus,
|
|
588
591
|
onCloseAutoFocus,
|
|
589
592
|
onEscapeKeyDown,
|
|
@@ -604,6 +607,7 @@ export function Dialog({
|
|
|
604
607
|
aria-labelledby={undefined}
|
|
605
608
|
aria-describedby={undefined}
|
|
606
609
|
className={contentClassName}
|
|
610
|
+
style={contentStyle}
|
|
607
611
|
data-ui-command-dialog=""
|
|
608
612
|
{...(onOpenAutoFocus ? { onOpenAutoFocus } : {})}
|
|
609
613
|
{...(onCloseAutoFocus ? { onCloseAutoFocus } : {})}
|
|
@@ -515,7 +515,7 @@ function ContentImpl({
|
|
|
515
515
|
tabIndex={-1}
|
|
516
516
|
{...props}
|
|
517
517
|
ref={ref ?? nodeRef}
|
|
518
|
-
style={
|
|
518
|
+
style={root.modal ? { pointerEvents: "auto", ...style } : style}
|
|
519
519
|
onPointerDownCapture={composeHandlers(
|
|
520
520
|
onPointerDownCapture,
|
|
521
521
|
layerProps.onPointerDownCapture,
|
|
@@ -168,6 +168,9 @@ function containingBlockOrigin(node: HTMLElement): { x: number; y: number } {
|
|
|
168
168
|
return { x: 0, y: 0 };
|
|
169
169
|
}
|
|
170
170
|
|
|
171
|
+
/** Surfaces that blur their backdrop: an overlay opened from inside one must not blur again. */
|
|
172
|
+
const GLASS_ANCESTORS = ".glass, .glass-clear, .liquid, .liquid-clear, .surface-overlay";
|
|
173
|
+
|
|
171
174
|
export function Content({
|
|
172
175
|
side = "bottom",
|
|
173
176
|
align = "center",
|
|
@@ -202,6 +205,13 @@ export function Content({
|
|
|
202
205
|
const paddingRef = useRef(collisionPadding);
|
|
203
206
|
paddingRef.current = collisionPadding;
|
|
204
207
|
|
|
208
|
+
// A panel portaled out of a glass surface is not its DOM descendant, so the CSS nesting rule
|
|
209
|
+
// cannot see it: mark it so the glass utilities drop the second blur (glass on glass).
|
|
210
|
+
useLayoutEffect(() => {
|
|
211
|
+
if (!content || !anchor || typeof anchor.closest !== "function") return;
|
|
212
|
+
content.toggleAttribute("data-glass-nested", anchor.closest(GLASS_ANCESTORS) !== null);
|
|
213
|
+
}, [content, anchor]);
|
|
214
|
+
|
|
205
215
|
// The wrapper owns the stacking context; the styled content decides its z-index.
|
|
206
216
|
useLayoutEffect(() => {
|
|
207
217
|
if (content && wrapperRef.current) {
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import {
|
|
4
4
|
type ClipboardEvent,
|
|
5
|
+
type DragEvent,
|
|
5
6
|
type KeyboardEvent,
|
|
6
7
|
type ReactNode,
|
|
7
8
|
useCallback,
|
|
@@ -122,6 +123,39 @@ function selectionIn(root: HTMLElement | null): Range | null {
|
|
|
122
123
|
return root.contains(range.commonAncestorContainer) ? range : null;
|
|
123
124
|
}
|
|
124
125
|
|
|
126
|
+
/** Sanitized HTML for transferred data: its `text/html`, else its `text/plain` as paragraphs, else "". */
|
|
127
|
+
function htmlFromTransfer(data: DataTransfer | null, fallbackText = ""): string {
|
|
128
|
+
const html = data?.getData("text/html") ?? "";
|
|
129
|
+
const text = data?.getData("text/plain") || fallbackText;
|
|
130
|
+
if (html) return sanitizeHtml(html);
|
|
131
|
+
if (!text) return "";
|
|
132
|
+
return sanitizeHtml(
|
|
133
|
+
text
|
|
134
|
+
.split(/\r?\n/)
|
|
135
|
+
.map((line) => `<p>${line.replace(/&/g, "&").replace(/</g, "<")}</p>`)
|
|
136
|
+
.join(""),
|
|
137
|
+
);
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** Moves the caret to the point under the pointer, when that point is inside `root`. */
|
|
141
|
+
function placeCaretAt(root: HTMLElement, x: number, y: number) {
|
|
142
|
+
const d = document as Document & {
|
|
143
|
+
caretPositionFromPoint?: (x: number, y: number) => { offsetNode: Node; offset: number } | null;
|
|
144
|
+
};
|
|
145
|
+
let range: Range | null = null;
|
|
146
|
+
const position = d.caretPositionFromPoint?.(x, y);
|
|
147
|
+
if (position) {
|
|
148
|
+
range = document.createRange();
|
|
149
|
+
range.setStart(position.offsetNode, position.offset);
|
|
150
|
+
range.collapse(true);
|
|
151
|
+
} else {
|
|
152
|
+
range = document.caretRangeFromPoint?.(x, y) ?? null;
|
|
153
|
+
}
|
|
154
|
+
if (!range || !root.contains(range.startContainer)) return;
|
|
155
|
+
window.getSelection()?.removeAllRanges();
|
|
156
|
+
window.getSelection()?.addRange(range);
|
|
157
|
+
}
|
|
158
|
+
|
|
125
159
|
/**
|
|
126
160
|
* Rich text editor on a plain `contenteditable`, with no dependencies. Supports bold, italic,
|
|
127
161
|
* underline, a title, bullet and numbered lists and links (Ctrl/Cmd+B, I, U, K). Everything that
|
|
@@ -146,6 +180,7 @@ export function RichTextEditor({
|
|
|
146
180
|
const toolbar = useRef<HTMLDivElement>(null);
|
|
147
181
|
const linkInput = useRef<HTMLInputElement>(null);
|
|
148
182
|
const savedRange = useRef<Range | null>(null);
|
|
183
|
+
const dragSource = useRef<Range | null>(null);
|
|
149
184
|
const lastEmitted = useRef<string>("");
|
|
150
185
|
const [empty, setEmpty] = useState(() => htmlToText(sanitizeHtml(value ?? defaultValue)) === "");
|
|
151
186
|
const [active, setActive] = useState<Set<Command>>(new Set());
|
|
@@ -235,7 +270,10 @@ export function RichTextEditor({
|
|
|
235
270
|
restoreSelection();
|
|
236
271
|
const selection = window.getSelection();
|
|
237
272
|
if (selection?.isCollapsed) {
|
|
238
|
-
document.
|
|
273
|
+
const anchor = document.createElement("a");
|
|
274
|
+
anchor.setAttribute("href", href);
|
|
275
|
+
anchor.textContent = href;
|
|
276
|
+
document.execCommand("insertHTML", false, sanitizeHtml(anchor.outerHTML));
|
|
239
277
|
} else {
|
|
240
278
|
document.execCommand("createLink", false, href);
|
|
241
279
|
}
|
|
@@ -257,22 +295,84 @@ export function RichTextEditor({
|
|
|
257
295
|
}
|
|
258
296
|
};
|
|
259
297
|
|
|
298
|
+
const insertClean = useCallback(
|
|
299
|
+
(clean: string): boolean => {
|
|
300
|
+
const node = editor.current;
|
|
301
|
+
if (!clean || !node) return false;
|
|
302
|
+
node.focus();
|
|
303
|
+
if (!selectionIn(node)) {
|
|
304
|
+
const end = document.createRange();
|
|
305
|
+
end.selectNodeContents(node);
|
|
306
|
+
end.collapse(false);
|
|
307
|
+
window.getSelection()?.removeAllRanges();
|
|
308
|
+
window.getSelection()?.addRange(end);
|
|
309
|
+
}
|
|
310
|
+
document.execCommand("insertHTML", false, clean);
|
|
311
|
+
emit();
|
|
312
|
+
return true;
|
|
313
|
+
},
|
|
314
|
+
[emit],
|
|
315
|
+
);
|
|
316
|
+
|
|
260
317
|
const onPaste = (event: ClipboardEvent<HTMLDivElement>) => {
|
|
261
318
|
event.preventDefault();
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
.map((line) => `<p>${line.replace(/&/g, "&").replace(/</g, "<")}</p>`)
|
|
270
|
-
.join(""),
|
|
271
|
-
);
|
|
272
|
-
document.execCommand("insertHTML", false, clean);
|
|
273
|
-
emit();
|
|
319
|
+
insertClean(htmlFromTransfer(event.clipboardData));
|
|
320
|
+
};
|
|
321
|
+
|
|
322
|
+
// A drag that starts inside this editor moves its selection; one from elsewhere copies.
|
|
323
|
+
const onDragStart = () => {
|
|
324
|
+
const range = selectionIn(editor.current);
|
|
325
|
+
dragSource.current = range && !range.collapsed ? range.cloneRange() : null;
|
|
274
326
|
};
|
|
275
327
|
|
|
328
|
+
const onDragEnd = () => {
|
|
329
|
+
dragSource.current = null;
|
|
330
|
+
};
|
|
331
|
+
|
|
332
|
+
const onDrop = (event: DragEvent<HTMLDivElement>) => {
|
|
333
|
+
event.preventDefault();
|
|
334
|
+
const source = dragSource.current;
|
|
335
|
+
dragSource.current = null;
|
|
336
|
+
if (editor.current) placeCaretAt(editor.current, event.clientX, event.clientY);
|
|
337
|
+
if (source) {
|
|
338
|
+
const target = selectionIn(editor.current);
|
|
339
|
+
if (target && source.isPointInRange(target.startContainer, target.startOffset)) return;
|
|
340
|
+
}
|
|
341
|
+
if (insertClean(htmlFromTransfer(event.dataTransfer)) && source) {
|
|
342
|
+
source.deleteContents();
|
|
343
|
+
emit();
|
|
344
|
+
}
|
|
345
|
+
};
|
|
346
|
+
|
|
347
|
+
// Whatever the browser would insert by itself from foreign data goes through the sanitizer.
|
|
348
|
+
// React's onBeforeInput is not the native event, so this listens directly.
|
|
349
|
+
useEffect(() => {
|
|
350
|
+
const node = editor.current;
|
|
351
|
+
if (!node) return;
|
|
352
|
+
const onBeforeInput = (event: InputEvent) => {
|
|
353
|
+
if (
|
|
354
|
+
event.inputType !== "insertFromDrop" &&
|
|
355
|
+
event.inputType !== "insertFromPaste" &&
|
|
356
|
+
event.inputType !== "insertReplacementText"
|
|
357
|
+
)
|
|
358
|
+
return;
|
|
359
|
+
event.preventDefault();
|
|
360
|
+
const target = event.getTargetRanges?.()[0];
|
|
361
|
+
if (target && event.inputType === "insertReplacementText") {
|
|
362
|
+
const range = document.createRange();
|
|
363
|
+
range.setStart(target.startContainer, target.startOffset);
|
|
364
|
+
range.setEnd(target.endContainer, target.endOffset);
|
|
365
|
+
if (node.contains(range.commonAncestorContainer)) {
|
|
366
|
+
window.getSelection()?.removeAllRanges();
|
|
367
|
+
window.getSelection()?.addRange(range);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
insertClean(htmlFromTransfer(event.dataTransfer, event.data ?? ""));
|
|
371
|
+
};
|
|
372
|
+
node.addEventListener("beforeinput", onBeforeInput);
|
|
373
|
+
return () => node.removeEventListener("beforeinput", onBeforeInput);
|
|
374
|
+
}, [insertClean]);
|
|
375
|
+
|
|
276
376
|
const onToolbarKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
|
|
277
377
|
const buttons = Array.from(
|
|
278
378
|
toolbar.current?.querySelectorAll<HTMLButtonElement>("button[data-tool]") ?? [],
|
|
@@ -439,6 +539,9 @@ export function RichTextEditor({
|
|
|
439
539
|
spellCheck
|
|
440
540
|
onInput={emit}
|
|
441
541
|
onPaste={onPaste}
|
|
542
|
+
onDragStart={onDragStart}
|
|
543
|
+
onDragEnd={onDragEnd}
|
|
544
|
+
onDrop={onDrop}
|
|
442
545
|
onKeyDown={onEditorKeyDown}
|
|
443
546
|
onBlur={emit}
|
|
444
547
|
style={{ minHeight: `${minHeightRem}rem` }}
|
|
@@ -63,19 +63,56 @@ const DROP_WITH_CONTENT = new Set([
|
|
|
63
63
|
|
|
64
64
|
const VOID_TAGS = new Set(["br"]);
|
|
65
65
|
|
|
66
|
+
// Case-sensitive, as in HTML5 (`∷` is a different character from `:`).
|
|
66
67
|
const NAMED_ENTITIES: Record<string, string> = {
|
|
67
68
|
amp: "&",
|
|
69
|
+
AMP: "&",
|
|
68
70
|
lt: "<",
|
|
71
|
+
LT: "<",
|
|
69
72
|
gt: ">",
|
|
73
|
+
GT: ">",
|
|
70
74
|
quot: '"',
|
|
75
|
+
QUOT: '"',
|
|
71
76
|
apos: "'",
|
|
72
|
-
nbsp: "
|
|
77
|
+
nbsp: "\u00a0",
|
|
73
78
|
colon: ":",
|
|
74
|
-
|
|
75
|
-
|
|
79
|
+
Tab: "\t",
|
|
80
|
+
NewLine: "\n",
|
|
76
81
|
sol: "/",
|
|
77
82
|
};
|
|
78
83
|
|
|
84
|
+
let decoder: HTMLTextAreaElement | undefined;
|
|
85
|
+
const decodedNames = new Map<string, string>();
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* Full HTML5 named-entity decoding. With a DOM, the engine's own parser does it through a detached
|
|
89
|
+
* textarea (it runs no script and loads nothing, and the input is only `&name;` characters).
|
|
90
|
+
*
|
|
91
|
+
* Without a DOM (server rendering) only the table above applies, so other entities such as
|
|
92
|
+
* `é` stay as escaped text there and the same HTML can render differently on the server and
|
|
93
|
+
* in the browser. That is deliberate: a full table is too heavy to ship. Under Trusted Types the
|
|
94
|
+
* `innerHTML` assignment throws; the entity is then left undecoded, which stays escaped on emit.
|
|
95
|
+
*/
|
|
96
|
+
function decodeNamed(match: string, body: string): string {
|
|
97
|
+
const known = NAMED_ENTITIES[body];
|
|
98
|
+
if (known !== undefined) return known;
|
|
99
|
+
if (decoder === undefined && typeof document !== "undefined")
|
|
100
|
+
decoder = document.createElement("textarea");
|
|
101
|
+
if (!decoder) return match;
|
|
102
|
+
let out = decodedNames.get(match);
|
|
103
|
+
if (out === undefined) {
|
|
104
|
+
try {
|
|
105
|
+
decoder.innerHTML = match;
|
|
106
|
+
out = decoder.value;
|
|
107
|
+
} catch {
|
|
108
|
+
return match;
|
|
109
|
+
}
|
|
110
|
+
if (decodedNames.size > 512) decodedNames.clear();
|
|
111
|
+
decodedNames.set(match, out);
|
|
112
|
+
}
|
|
113
|
+
return out;
|
|
114
|
+
}
|
|
115
|
+
|
|
79
116
|
function decodeEntities(text: string): string {
|
|
80
117
|
return text.replace(/&(#x[0-9a-f]+|#\d+|[a-z][a-z0-9]*);?/gi, (match, body: string) => {
|
|
81
118
|
if (body[0] === "#") {
|
|
@@ -84,7 +121,7 @@ function decodeEntities(text: string): string {
|
|
|
84
121
|
if (!Number.isFinite(code) || code <= 0 || code > 0x10ffff) return "";
|
|
85
122
|
return String.fromCodePoint(code);
|
|
86
123
|
}
|
|
87
|
-
return
|
|
124
|
+
return decodeNamed(match, body);
|
|
88
125
|
});
|
|
89
126
|
}
|
|
90
127
|
|
|
@@ -107,16 +144,32 @@ function isInvisible(code: number): boolean {
|
|
|
107
144
|
);
|
|
108
145
|
}
|
|
109
146
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
147
|
+
const ALLOWED_PROTOCOLS = new Set(["http:", "https:", "mailto:", "tel:"]);
|
|
148
|
+
const IGNORED_IN_URL = /[\s\p{Cf}]/gu;
|
|
149
|
+
|
|
150
|
+
/** The one string that is validated and emitted: entities decoded once, ends trimmed. */
|
|
151
|
+
function normalizeHref(raw: string): string {
|
|
152
|
+
return decodeEntities(raw).trim();
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
function isAllowedHref(href: string): boolean {
|
|
156
|
+
// Browsers ignore control characters and whitespace around and inside the scheme ("java\tscript:").
|
|
157
|
+
// Strip every whitespace and format character too, so no prefix can hide a scheme from this check.
|
|
158
|
+
const url = Array.from(href)
|
|
114
159
|
.filter((char) => !isInvisible(char.codePointAt(0) ?? 0))
|
|
115
|
-
.join("")
|
|
160
|
+
.join("")
|
|
161
|
+
.replace(IGNORED_IN_URL, "");
|
|
116
162
|
if (url === "") return false;
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
163
|
+
try {
|
|
164
|
+
return ALLOWED_PROTOCOLS.has(new URL(url, "https://invalid.invalid/").protocol);
|
|
165
|
+
} catch {
|
|
166
|
+
return false;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/** True for http(s), mailto, tel and scheme-less (relative or fragment) URLs. */
|
|
171
|
+
export function isSafeUrl(raw: string): boolean {
|
|
172
|
+
return isAllowedHref(normalizeHref(raw));
|
|
120
173
|
}
|
|
121
174
|
|
|
122
175
|
interface ParsedTag {
|
|
@@ -172,6 +225,9 @@ function parseTag(html: string, start: number): ParsedTag | null {
|
|
|
172
225
|
};
|
|
173
226
|
}
|
|
174
227
|
|
|
228
|
+
/** Deepest run of open elements kept; tags beyond it are unwrapped (their text stays). */
|
|
229
|
+
const MAX_OPEN_DEPTH = 128;
|
|
230
|
+
|
|
175
231
|
/** Returns safe, balanced HTML containing only the editor's vocabulary. */
|
|
176
232
|
export function sanitizeHtml(input: string): string {
|
|
177
233
|
const html = String(input ?? "");
|
|
@@ -179,10 +235,21 @@ export function sanitizeHtml(input: string): string {
|
|
|
179
235
|
const stack: string[] = [];
|
|
180
236
|
let i = 0;
|
|
181
237
|
|
|
238
|
+
// Open count per tag: an unmatched closer then costs O(1) instead of a scan of the whole stack.
|
|
239
|
+
const open: Record<string, number> = Object.create(null);
|
|
240
|
+
const pop = () => {
|
|
241
|
+
const name = stack.pop() as string;
|
|
242
|
+
open[name] = (open[name] as number) - 1;
|
|
243
|
+
out.push(`</${name}>`);
|
|
244
|
+
};
|
|
245
|
+
const push = (name: string) => {
|
|
246
|
+
stack.push(name);
|
|
247
|
+
open[name] = (open[name] ?? 0) + 1;
|
|
248
|
+
};
|
|
182
249
|
const closeTo = (name: string) => {
|
|
250
|
+
if (!open[name]) return;
|
|
183
251
|
const at = stack.lastIndexOf(name);
|
|
184
|
-
|
|
185
|
-
while (stack.length > at) out.push(`</${stack.pop()}>`);
|
|
252
|
+
while (stack.length > at) pop();
|
|
186
253
|
};
|
|
187
254
|
|
|
188
255
|
while (i < html.length) {
|
|
@@ -213,11 +280,13 @@ export function sanitizeHtml(input: string): string {
|
|
|
213
280
|
i = tag.end;
|
|
214
281
|
|
|
215
282
|
if (!tag.closing && DROP_WITH_CONTENT.has(tag.name)) {
|
|
216
|
-
const closer = new RegExp(`</${tag.name}[\\s/>]`, "
|
|
217
|
-
|
|
283
|
+
const closer = new RegExp(`</${tag.name}[\\s/>]`, "gi");
|
|
284
|
+
closer.lastIndex = i;
|
|
285
|
+
const found = closer.exec(html);
|
|
286
|
+
if (!found) {
|
|
218
287
|
i = html.length;
|
|
219
288
|
} else {
|
|
220
|
-
const close = html.indexOf(">",
|
|
289
|
+
const close = html.indexOf(">", found.index);
|
|
221
290
|
i = close === -1 ? html.length : close + 1;
|
|
222
291
|
}
|
|
223
292
|
continue;
|
|
@@ -236,15 +305,16 @@ export function sanitizeHtml(input: string): string {
|
|
|
236
305
|
}
|
|
237
306
|
if (name === "a") {
|
|
238
307
|
closeTo("a");
|
|
239
|
-
|
|
240
|
-
|
|
308
|
+
if (stack.length >= MAX_OPEN_DEPTH) continue;
|
|
309
|
+
const href = tag.attributes.href === undefined ? "" : normalizeHref(tag.attributes.href);
|
|
310
|
+
if (isAllowedHref(href)) {
|
|
241
311
|
out.push(
|
|
242
|
-
`<a href="${escapeAttribute(
|
|
312
|
+
`<a href="${escapeAttribute(href)}" rel="noopener noreferrer nofollow" target="_blank">`,
|
|
243
313
|
);
|
|
244
314
|
} else {
|
|
245
315
|
out.push("<a>");
|
|
246
316
|
}
|
|
247
|
-
|
|
317
|
+
push("a");
|
|
248
318
|
continue;
|
|
249
319
|
}
|
|
250
320
|
// Block elements cannot nest inside inline ones or inside paragraphs; close what they would break.
|
|
@@ -252,11 +322,12 @@ export function sanitizeHtml(input: string): string {
|
|
|
252
322
|
for (const open of ["p", "h2", "h3"]) closeTo(open);
|
|
253
323
|
}
|
|
254
324
|
if (name === "li") closeTo("li");
|
|
325
|
+
if (stack.length >= MAX_OPEN_DEPTH) continue;
|
|
255
326
|
out.push(`<${name}>`);
|
|
256
|
-
|
|
327
|
+
push(name);
|
|
257
328
|
}
|
|
258
329
|
|
|
259
|
-
while (stack.length)
|
|
330
|
+
while (stack.length) pop();
|
|
260
331
|
return out.join("").replace(/<a><\/a>/g, "");
|
|
261
332
|
}
|
|
262
333
|
|