开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
feat(text): support custom font-size #374
pubuzhixing855d8fb1bbf8f
diff --git a/packages/drawnix/src/components/icons.tsx b/packages/drawnix/src/components/icons.tsxindex 13a14dc..7c7b01f 100644--- a/packages/drawnix/src/components/icons.tsx+++ b/packages/drawnix/src/components/icons.tsx@@ -569,3 +569,71 @@ export const NoteCurlyLeftIcon = createIcon(</g></svg>);++export const ChevronDownIcon = createIcon(+ <svg+ width="15"+ height="15"+ viewBox="0 0 15 15"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="M3.13523 6.15803C3.3241 5.95657 3.64052 5.94637 3.84197 6.13523L7.5 9.56464L11.158 6.13523C11.3595 5.94637 11.6759 5.95657 11.8648 6.15803C12.0536 6.35949 12.0434 6.67591 11.842 6.86477L7.84197 10.6148C7.64964 10.7951 7.35036 10.7951 7.15803 10.6148L3.15803 6.86477C2.95657 6.67591 2.94637 6.35949 3.13523 6.15803Z"+ fill="currentColor"+ fillRule="evenodd"+ clipRule="evenodd"+ ></path>+ </svg>+);++export const ThickCheckIcon = createIcon(+ <svg+ width="15"+ height="15"+ viewBox="0 0 15 15"+ fill="none"+ xmlns="http://www.w3.org/2000/svg"+ >+ <path+ d="M11.4669 3.72684C11.7558 3.91574 11.8369 4.30308 11.648 4.59198L7.39799 11.092C7.29783 11.2452 7.13556 11.3467 6.95402 11.3699C6.77247 11.3931 6.58989 11.3355 6.45446 11.2124L3.70446 8.71241C3.44905 8.48022 3.43023 8.08494 3.66242 7.82953C3.89461 7.57412 4.28989 7.55529 4.5453 7.78749L6.75292 9.79441L10.6018 3.90792C10.7907 3.61902 11.178 3.53795 11.4669 3.72684Z"+ fill="currentColor"+ fillRule="evenodd"+ clipRule="evenodd"+ ></path>+ </svg>+);++export const FontSizeStepperUpIcon: React.FC<+ React.SVGProps<SVGSVGElement>+> = (props) => {+ return (+ <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}>+ <path+ d="M4 10L8 6L12 10"+ fill="none"+ stroke="currentColor"+ strokeWidth="1.5"+ strokeLinecap="round"+ strokeLinejoin="round"+ />+ </svg>+ );+};++export const FontSizeStepperDownIcon: React.FC<+ React.SVGProps<SVGSVGElement>+> = (props) => {+ return (+ <svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" {...props}>+ <path+ d="M4 6L8 10L12 6"+ fill="none"+ stroke="currentColor"+ strokeWidth="1.5"+ strokeLinecap="round"+ strokeLinejoin="round"+ />+ </svg>+ );+};diff --git a/packages/drawnix/src/components/select/select.scss b/packages/drawnix/src/components/select/select.scssnew file mode 100644index 0000000..175020b--- /dev/null+++ b/packages/drawnix/src/components/select/select.scss@@ -0,0 +1,215 @@+.drawnix {+ /* Define local variables mapped to project theme or defaults */+ --dx-select-trigger-height: 2rem;+ --dx-select-content-padding: 4px;+ --dx-select-item-height: 2rem;+ --dx-select-item-indicator-width: 20px;+ --dx-select-separator-margin-right: 8px;++ /* Trigger Styles */+ .dx-SelectTrigger {+ display: inline-flex;+ align-items: center;+ justify-content: space-between;+ flex-shrink: 0;+ user-select: none;+ vertical-align: top;+ height: var(--dx-select-trigger-height);+ box-sizing: border-box;+ font-family: inherit;+ font-size: 14px;+ line-height: 1;+ text-align: left;+ cursor: default;+ background-color: var(--island-bg-color);+ color: var(--color-text-primary);+ border: 1px solid var(--island-border-color);+ border-radius: var(--border-radius-md);+ padding: 0 var(--dx-space-2);+ gap: var(--dx-space-2);+ outline: none;++ &:hover {+ background-color: var(--color-gray-10);+ border-color: var(--color-gray-40);+ }++ &[data-state='open'] {+ border-color: var(--color-primary);+ box-shadow: 0 0 0 1px var(--color-primary);+ }++ &:focus-visible {+ border-color: var(--color-primary);+ box-shadow: 0 0 0 1px var(--color-primary);+ }++ &[data-disabled] {+ color: var(--color-text-disabled);+ background-color: var(--color-bg-disabled);+ cursor: not-allowed;+ }++ &.dx-variant-ghost {+ background-color: transparent;+ border-color: transparent;+ &:hover {+ background-color: var(--color-gray-10);+ }+ }+ }++ .dx-SelectTriggerInner {+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ flex: 1;+ }++ .dx-SelectIcon {+ flex-shrink: 0;+ color: var(--color-text-secondary);+ display: flex;+ align-items: center;++ svg {+ display: block;+ }+ }++ /* Content Styles */+ .dx-SelectContent {+ box-sizing: border-box;+ background-color: var(--island-bg-color);+ border: 1px solid var(--island-border-color);+ box-shadow: var(--shadow-island);+ border-radius: var(--border-radius-lg);+ padding: var(--dx-select-content-padding);+ min-width: var(--radix-select-trigger-width); /* Note: Floating UI might handle width */+ max-height: 300px;+ overflow: hidden;+ z-index: 1000;+ display: flex;+ flex-direction: column;++ &:focus-visible {+ outline: 2px solid var(--color-primary);+ outline-offset: 2px;+ }+ }++ .dx-SelectContent[data-hide-selected-indicator] {+ .dx-SelectItem {+ padding-left: var(--dx-space-2);+ }++ .dx-SelectItemIndicator {+ display: none;+ }+ }++ .dx-SelectViewport {+ overflow-y: auto;+ padding: 0;+ flex: 1;+ }++ /* Item Styles */+ .dx-SelectItem {+ display: flex;+ align-items: center;+ width: 100%;+ height: var(--dx-select-item-height);+ padding: 0 var(--dx-space-2) 0 var(--dx-select-item-indicator-width);+ position: relative;+ box-sizing: border-box;+ outline: none;+ user-select: none;+ cursor: pointer;+ border: none;+ background: transparent;+ color: var(--color-text-primary);+ font-size: 14px;+ border-radius: var(--dx-radius-2);+ text-align: center;++ &[data-highlighted] {+ background-color: var(--color-primary);+ color: var(--color-icon-white);++ .dx-SelectItemIndicator {+ color: var(--color-icon-white);+ }+ }++ &[data-disabled] {+ color: var(--color-text-disabled);+ cursor: not-allowed;+ }+ }++ .dx-SelectItemIndicator {+ position: absolute;+ left: 0;+ width: var(--dx-select-item-indicator-width);+ display: inline-flex;+ align-items: center;+ justify-content: center;+ color: var(--color-primary);+ }++ .dx-SelectItemText {+ flex: 1;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ text-align: inherit;+ }++ /* Label, Group, Separator */+ .dx-SelectLabel {+ display: flex;+ align-items: center;+ height: var(--dx-select-item-height);+ padding-left: var(--dx-select-item-indicator-width);+ padding-right: var(--dx-space-2);+ color: var(--color-text-secondary);+ font-size: 12px;+ font-weight: 500;+ user-select: none;+ cursor: default;+ }++ .dx-SelectSeparator {+ height: 1px;+ background-color: var(--island-border-color);+ margin: var(--dx-space-1) 0;+ }++ /* Size Variants */+ .dx-r-size-1 {+ --dx-select-trigger-height: 24px;+ --dx-select-item-height: 24px;+ font-size: 12px;++ &.dx-SelectItem {+ font-size: 12px;+ }+ }++ .dx-r-size-2 {+ --dx-select-trigger-height: 32px;+ --dx-select-item-height: 28px; /* Radix often uses slightly smaller items */+ font-size: 14px;+ }++ .dx-r-size-3 {+ --dx-select-trigger-height: 40px;+ --dx-select-item-height: 32px;+ font-size: 16px;++ &.dx-SelectItem {+ font-size: 16px;+ }+ }+}diff --git a/packages/drawnix/src/components/select/select.tsx b/packages/drawnix/src/components/select/select.tsxnew file mode 100644index 0000000..f122064--- /dev/null+++ b/packages/drawnix/src/components/select/select.tsx@@ -0,0 +1,464 @@+import * as React from 'react';+import classNames from 'classnames';+import {+ autoUpdate,+ flip,+ FloatingFocusManager,+ FloatingList,+ FloatingPortal,+ offset,+ Placement,+ shift,+ useClick,+ useDismiss,+ useFloating,+ useInteractions,+ useListItem,+ useListNavigation,+ useMergeRefs,+ useRole,+ useTypeahead,+} from '@floating-ui/react';+import { ChevronDownIcon, ThickCheckIcon } from '../icons';+import './select.scss';++type SelectValueType = string;++interface SelectContextType {+ open: boolean;+ setOpen: (open: boolean) => void;+ value: SelectValueType | undefined;+ setValue: (value: SelectValueType) => void;+ activeIndex: number | null;+ setActiveIndex: (index: number | null) => void;+ selectedIndex: number | null;+ elementsRef: React.MutableRefObject<Array<HTMLElement | null>>;+ labelsRef: React.MutableRefObject<Array<string | null>>;+ valuesRef: React.MutableRefObject<Array<SelectValueType | null>>;+ getReferenceProps: ReturnType<typeof useInteractions>['getReferenceProps'];+ getFloatingProps: ReturnType<typeof useInteractions>['getFloatingProps'];+ getItemProps: ReturnType<typeof useInteractions>['getItemProps'];+ refs: ReturnType<typeof useFloating>['refs'];+ floatingStyles: React.CSSProperties;+ floatingContext: ReturnType<typeof useFloating>['context'];+ size: '1' | '2' | '3';+ hideSelectedIndicator: boolean;+ disableItemHoverHighlight: boolean;+}++const SelectContext = React.createContext<SelectContextType | null>(null);++const useSelectContext = () => {+ const context = React.useContext(SelectContext);+ if (!context) {+ throw new Error('Select components must be wrapped in <Select.Root />');+ }+ return context;+};++interface SelectRootProps {+ children: React.ReactNode;+ value?: string;+ defaultValue?: string;+ onValueChange?: (value: string) => void;+ open?: boolean;+ defaultOpen?: boolean;+ onOpenChange?: (open: boolean) => void;+ size?: '1' | '2' | '3';+ disabled?: boolean;+ placement?: Placement;+ sideOffset?: number;+ hideSelectedIndicator?: boolean;+ disableItemHoverHighlight?: boolean;+ disableInitialHighlight?: boolean;+ disableTypeahead?: boolean;+}++const SelectRoot: React.FC<SelectRootProps> = ({+ children,+ value: controlledValue,+ defaultValue,+ onValueChange,+ open: controlledOpen,+ defaultOpen = false,+ onOpenChange: setControlledOpen,+ size = '2',+ disabled = false,+ placement = 'bottom-start',+ sideOffset = 4,+ hideSelectedIndicator = false,+ disableItemHoverHighlight = false,+ disableInitialHighlight = false,+ disableTypeahead = false,+}) => {+ const [uncontrolledOpen, setUncontrolledOpen] = React.useState(defaultOpen);+ const open = controlledOpen ?? uncontrolledOpen;+ const setOpen = setControlledOpen ?? setUncontrolledOpen;++ const [uncontrolledValue, setUncontrolledValue] = React.useState<+ string | undefined+ >(defaultValue);+ const value = controlledValue ?? uncontrolledValue;+ const setValue = React.useCallback(+ (nextValue: string) => {+ if (controlledValue === undefined) {+ setUncontrolledValue(nextValue);+ }+ onValueChange?.(nextValue);+ },+ [controlledValue, onValueChange]+ );++ const elementsRef = React.useRef<Array<HTMLElement | null>>([]);+ const labelsRef = React.useRef<Array<string | null>>([]);+ const valuesRef = React.useRef<Array<SelectValueType | null>>([]);+ const [activeIndex, setActiveIndex] = React.useState<number | null>(null);++ const selectedIndex = React.useMemo(() => {+ if (value == null) return null;+ const index = valuesRef.current.findIndex((v) => v === value);+ return index >= 0 ? index : null;+ }, [value]);++ const navigationSelectedIndex = disableInitialHighlight ? null : selectedIndex;++ React.useEffect(() => {+ if (!open) return;+ if (disableInitialHighlight) {+ setActiveIndex(null);+ return;+ }+ setActiveIndex(selectedIndex ?? 0);+ }, [open, selectedIndex, disableInitialHighlight]);++ const { refs, floatingStyles, context } = useFloating({+ placement,+ open,+ onOpenChange: setOpen,+ whileElementsMounted: autoUpdate,+ middleware: [+ offset(sideOffset),+ flip({ padding: 5 }),+ shift({ padding: 5 }),+ ],+ });++ const click = useClick(context, { enabled: !disabled && controlledOpen === undefined });+ const dismiss = useDismiss(context);+ const role = useRole(context, { role: 'listbox' });++ const listNavigation = useListNavigation(context, {+ listRef: elementsRef,+ activeIndex,+ selectedIndex: navigationSelectedIndex,+ onNavigate: setActiveIndex,+ loop: true,+ focusItemOnHover: !disableItemHoverHighlight,+ });++ const typeahead = useTypeahead(context, {+ listRef: labelsRef,+ activeIndex,+ selectedIndex: navigationSelectedIndex,+ onMatch: setActiveIndex,+ });++ const { getReferenceProps, getFloatingProps, getItemProps } = useInteractions([+ click,+ dismiss,+ role,+ listNavigation,+ disableTypeahead ? ({} as any) : typeahead,+ ]);++ const contextValue = React.useMemo(+ () => ({+ open,+ setOpen,+ value,+ setValue,+ activeIndex,+ setActiveIndex,+ selectedIndex,+ elementsRef,+ labelsRef,+ valuesRef,+ getReferenceProps,+ getFloatingProps,+ getItemProps,+ refs,+ floatingStyles,+ floatingContext: context,+ size,+ hideSelectedIndicator,+ disableItemHoverHighlight,+ }),+ [+ open,+ setOpen,+ value,+ setValue,+ activeIndex,+ selectedIndex,+ getReferenceProps,+ getFloatingProps,+ getItemProps,+ refs,+ floatingStyles,+ context,+ size,+ hideSelectedIndicator,+ disableItemHoverHighlight,+ ]+ );++ return (+ <SelectContext.Provider value={contextValue}>+ {children}+ </SelectContext.Provider>+ );+};+SelectRoot.displayName = 'Select.Root';++interface SelectTriggerProps+ extends React.ButtonHTMLAttributes<HTMLButtonElement> {+ variant?: 'classic' | 'surface' | 'soft' | 'ghost';+ color?: string;+ radius?: 'none' | 'small' | 'medium' | 'large' | 'full';+ placeholder?: string;+ asChild?: boolean;+}++const SelectTrigger = React.forwardRef<HTMLButtonElement, SelectTriggerProps>(+ (+ {+ children,+ className,+ variant = 'surface',+ color,+ radius,+ placeholder,+ asChild,+ ...props+ },+ forwardedRef+ ) => {+ const context = useSelectContext();+ const mergedRef = useMergeRefs([context.refs.setReference, forwardedRef]);++ if (asChild && React.isValidElement(children)) {+ return React.cloneElement(children, {+ ref: mergedRef,+ ...context.getReferenceProps(props),+ 'data-state': context.open ? 'open' : 'closed',+ } as any);+ }++ // Value rendering logic+ let content = children;+ if (!content && context.value) {+ // Find label for value+ const index = context.valuesRef.current.indexOf(context.value);+ if (index !== -1) {+ content = context.labelsRef.current[index];+ } else {+ content = context.value;+ }+ }++ const shouldShowPlaceholder = !content && placeholder;+ const displayContent = shouldShowPlaceholder ? placeholder : content;++ return (+ <button+ type="button"+ ref={mergedRef}+ className={classNames(+ 'dx-reset',+ 'dx-SelectTrigger',+ `dx-r-size-${context.size}`,+ `dx-variant-${variant}`,+ className+ )}+ data-state={context.open ? 'open' : 'closed'}+ data-placeholder={shouldShowPlaceholder ? '' : undefined}+ {...context.getReferenceProps(props)}+ >+ <span className="dx-SelectTriggerInner">{displayContent}</span>+ <span className="dx-SelectIcon">+ {ChevronDownIcon}+ </span>+ </button>+ );+ }+);+SelectTrigger.displayName = 'Select.Trigger';++interface SelectContentProps extends React.HTMLAttributes<HTMLDivElement> {+ variant?: 'solid' | 'soft';+ color?: string;+ highContrast?: boolean;+ container?: HTMLElement | null;+}++const SelectContent = React.forwardRef<HTMLDivElement, SelectContentProps>(+ (+ {+ children,+ className,+ variant = 'solid',+ color,+ highContrast,+ container,+ style,+ ...props+ },+ forwardedRef+ ) => {+ const context = useSelectContext();+ const mergedRef = useMergeRefs([context.refs.setFloating, forwardedRef]);++ if (!context.open) return null;++ return (+ <FloatingPortal root={container}>+ <FloatingFocusManager context={context.floatingContext} initialFocus={-1}>+ <div+ ref={mergedRef}+ className={classNames(+ 'dx-SelectContent',+ `dx-r-size-${context.size}`,+ `dx-variant-${variant}`,+ className+ )}+ data-hide-selected-indicator={context.hideSelectedIndicator ? '' : undefined}+ style={{ ...context.floatingStyles, ...style }}+ {...context.getFloatingProps(props)}+ >+ <FloatingList elementsRef={context.elementsRef} labelsRef={context.labelsRef}>+ <div className="dx-SelectViewport">+ {children}+ </div>+ </FloatingList>+ </div>+ </FloatingFocusManager>+ </FloatingPortal>+ );+ }+);+SelectContent.displayName = 'Select.Content';++interface SelectItemProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {+ value: string;+ textValue?: string;+}++const SelectItem = React.forwardRef<HTMLButtonElement, SelectItemProps>(+ ({ children, className, value, textValue, disabled, ...props }, forwardedRef) => {+ const context = useSelectContext();+ const { ref: itemRef, index } = useListItem({+ label: textValue ?? (typeof children === 'string' ? children : value),+ });+ const mergedRef = useMergeRefs([itemRef, forwardedRef]);++ const isActive = context.activeIndex === index;+ const isSelected = context.value === value;++ React.useEffect(() => {+ if (index !== null) {+ context.valuesRef.current[index] = value;+ // Best effort to get label+ context.labelsRef.current[index] = textValue ?? (typeof children === 'string' ? children : value);+ }+ }, [index, value, textValue, children, context.valuesRef, context.labelsRef]);++ const handleSelect = () => {+ context.setValue(value);+ context.setOpen(false);+ };++ const mergedItemProps = context.getItemProps({+ ...props,+ onClick: (e: React.MouseEvent<HTMLElement>) => {+ props.onClick?.(e as React.MouseEvent<HTMLButtonElement>);+ handleSelect();+ },+ onKeyDown: (e: React.KeyboardEvent<HTMLElement>) => {+ props.onKeyDown?.(e as React.KeyboardEvent<HTMLButtonElement>);+ if (e.key === 'Enter') {+ e.preventDefault();+ handleSelect();+ }+ },+ });++ const {+ onPointerMove,+ onMouseMove,+ onMouseEnter,+ onMouseLeave,+ ...restMergedItemProps+ } = mergedItemProps as React.ButtonHTMLAttributes<HTMLButtonElement>;++ return (+ <button+ ref={mergedRef}+ type="button"+ role="option"+ aria-selected={isSelected}+ data-highlighted={isActive ? '' : undefined}+ data-state={isSelected ? 'checked' : 'unchecked'}+ data-disabled={disabled ? '' : undefined}+ tabIndex={isActive ? 0 : -1}+ className={classNames('dx-SelectItem', className)}+ disabled={disabled}+ {...restMergedItemProps}+ {...(context.disableItemHoverHighlight+ ? {}+ : { onPointerMove, onMouseMove, onMouseEnter, onMouseLeave })}+ >+ {!context.hideSelectedIndicator && (+ <span className="dx-SelectItemIndicator">+ {isSelected && ThickCheckIcon}+ </span>+ )}+ <span className="dx-SelectItemText">{children}</span>+ </button>+ );+ }+);+SelectItem.displayName = 'Select.Item';++type SelectGroupProps = React.HTMLAttributes<HTMLDivElement>+const SelectGroup = React.forwardRef<HTMLDivElement, SelectGroupProps>(+ ({ className, ...props }, ref) => (+ <div ref={ref} className={classNames('dx-SelectGroup', className)} {...props} />+ )+);+SelectGroup.displayName = 'Select.Group';++type SelectLabelProps = React.HTMLAttributes<HTMLDivElement>+const SelectLabel = React.forwardRef<HTMLDivElement, SelectLabelProps>(+ ({ className, ...props }, ref) => (+ <div ref={ref} className={classNames('dx-SelectLabel', className)} {...props} />+ )+);+SelectLabel.displayName = 'Select.Label';++type SelectSeparatorProps = React.HTMLAttributes<HTMLDivElement>+const SelectSeparator = React.forwardRef<HTMLDivElement, SelectSeparatorProps>(+ ({ className, ...props }, ref) => (+ <div ref={ref} className={classNames('dx-SelectSeparator', className)} {...props} />+ )+);+SelectSeparator.displayName = 'Select.Separator';++export const Select = {+ Root: SelectRoot,+ Trigger: SelectTrigger,+ Content: SelectContent,+ Item: SelectItem,+ Group: SelectGroup,+ Label: SelectLabel,+ Separator: SelectSeparator,+};diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsxindex eca5ec5..df4fa81 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/arrow-mark-button.tsx@@ -7,6 +7,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '../../popover/popover';import { ArrowLineHandle } from '@plait/draw';import { ArrowMarkerPicker } from '../../arrow-mark-picker';import { useI18n } from '../../../i18n';+import type { Translations } from '../../../i18n';export type ArrowMarkButtonProps = {board: PlaitBoard;@@ -21,10 +22,16 @@ export const ArrowMarkButton: React.FC<ArrowMarkButtonProps> = ({endProperty,}) => {const [isPopoverOpen, setIsPopoverrOpen] = useState(false);- const marker = endProperty?.marker;const container = PlaitBoard.getBoardContainer(board);const { t } = useI18n();- const title = `${t(`line.${end}`)} — ${t(`line.${marker}`)}`;+ if (!endProperty) {+ return null;+ }+ const marker = endProperty.marker ?? 'none';+ const endLabelKey: keyof Translations = end === 'source' ? 'line.source' : 'line.target';+ const markerLabelKey: keyof Translations =+ marker === 'none' ? 'line.none' : 'line.arrow';+ const title = `${t(endLabelKey)} — ${t(markerLabelKey)}`;return (<Popoverdiff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsxindex 56174bf..5291803 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/fill-button.tsx@@ -49,6 +49,7 @@ export const PopupFillButton: React.FC<PopupFillButtonProps> = ({<ToolButtonclassName={classNames(`property-button`)}visible={true}+ selected={isFillPropertyOpen}icon={icon}type="button"title={title}diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/font-size-control.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/font-size-control.tsxnew file mode 100644index 0000000..43b956f--- /dev/null+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/font-size-control.tsx@@ -0,0 +1,204 @@+import React, { useEffect, useMemo, useRef, useState } from 'react';+import { PlaitBoard } from '@plait/core';+import { setTextFontSize } from '../../../transforms/property';+import { FontSizeStepperDownIcon, FontSizeStepperUpIcon } from '../../icons';+import { Select } from '../../select/select';+import { DEFAULT_FONT_SIZE } from '@plait/text-plugins';++export type PopupFontSizeControlProps = {+ board: PlaitBoard;+ currentFontSize?: number;+ title: string;+ options?: number[];+};++const DEFAULT_OPTIONS = [10, 12, 14, 18, 24, 36, 48];+const MIN_FONT_SIZE = 8;+const MAX_FONT_SIZE = 78;++export const PopupFontSizeControl: React.FC<PopupFontSizeControlProps> = ({+ board,+ currentFontSize,+ title,+ options = DEFAULT_OPTIONS,+}) => {+ const [open, setOpen] = useState(false);+ const inputRef = useRef<HTMLInputElement | null>(null);+ const normalizedCurrent = useMemo(() => {+ return Number.isFinite(currentFontSize as number) &&+ (currentFontSize as number) > 0+ ? (currentFontSize as number)+ : undefined;+ }, [currentFontSize]);++ const [draft, setDraft] = useState<string>(+ normalizedCurrent ? String(normalizedCurrent) : String(DEFAULT_FONT_SIZE)+ );++ useEffect(() => {+ setDraft(normalizedCurrent ? String(normalizedCurrent) : String(DEFAULT_FONT_SIZE));+ }, [normalizedCurrent]);++ const apply = (value: string) => {+ if (!value) {+ setDraft('');+ return;+ }+ const next = Number(value);+ if (!Number.isFinite(next)) {+ return;+ }+ const clamped = Math.min(+ MAX_FONT_SIZE,+ Math.max(MIN_FONT_SIZE, Math.round(next))+ );+ const nextValue = String(clamped);+ setDraft(nextValue);+ setTextFontSize(board, clamped);+ };++ const getBaseValue = () => {+ const parsed = Number(draft);+ if (Number.isFinite(parsed)) {+ return Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, Math.round(parsed)));+ }+ if (typeof normalizedCurrent === 'number' && normalizedCurrent > 0) {+ return Math.min(+ MAX_FONT_SIZE,+ Math.max(MIN_FONT_SIZE, Math.round(normalizedCurrent))+ );+ }+ return DEFAULT_FONT_SIZE;+ };++ const stepBy = (delta: number) => {+ const base = getBaseValue();+ const next = Math.min(+ MAX_FONT_SIZE,+ Math.max(MIN_FONT_SIZE, Math.round(base + delta))+ );+ const value = String(next);+ setDraft(value);+ apply(value);+ };++ const container = PlaitBoard.getBoardContainer(board);++ return (+ <Select.Root+ open={open}+ onOpenChange={setOpen}+ placement={'top-start'}+ sideOffset={12}+ hideSelectedIndicator+ disableInitialHighlight+ disableItemHoverHighlight+ disableTypeahead+ >+ <Select.Trigger asChild>+ <div+ className="popup-font-size"+ title={title}+ aria-label={title}+ onPointerDown={(event) => {+ event.stopPropagation();+ }}+ onPointerUp={(event) => {+ event.stopPropagation();+ }}+ >+ <input+ ref={inputRef}+ className="popup-font-size__input"+ type="number"+ inputMode="numeric"+ min={MIN_FONT_SIZE}+ max={MAX_FONT_SIZE}+ step={1}+ value={draft}+ placeholder={''}+ onChange={(event) => setDraft(event.target.value)}+ onBlur={(event) => apply(event.target.value)}+ onPointerUp={(event) => {+ event.stopPropagation();+ setOpen(true);+ }}+ onKeyDown={(event) => {+ if (event.key === 'Enter') {+ apply(draft);+ }+ }}+ />+ <div className="popup-font-size__stepper" aria-hidden="false">+ <button+ type="button"+ className="popup-font-size__stepper-button"+ aria-label={`${title} +`}+ onPointerDown={(event) => {+ event.preventDefault();+ event.stopPropagation();+ }}+ onPointerUp={(event) => {+ event.stopPropagation();+ stepBy(1);+ inputRef.current?.focus();+ }}+ >+ <FontSizeStepperUpIcon+ className="popup-font-size__stepper-icon"+ aria-hidden="true"+ />+ </button>+ <button+ type="button"+ className="popup-font-size__stepper-button"+ aria-label={`${title} -`}+ onPointerDown={(event) => {+ event.preventDefault();+ event.stopPropagation();+ }}+ onPointerUp={(event) => {+ event.stopPropagation();+ stepBy(-1);+ inputRef.current?.focus();+ }}+ >+ <FontSizeStepperDownIcon+ className="popup-font-size__stepper-icon"+ aria-hidden="true"+ />+ </button>+ </div>+ </div>+ </Select.Trigger>+ <Select.Content+ container={container}+ style={{ minWidth: '4.5rem' }}+ onPointerDown={(event) => {+ event.preventDefault();+ event.stopPropagation();+ }}+ onPointerUp={(event) => {+ event.stopPropagation();+ }}+ >+ {options.map((size) => {+ const value = String(size);+ return (+ <Select.Item+ key={value}+ value={value}+ textValue={value}+ onPointerUp={() => {+ setDraft(value);+ apply(value);+ }}+ >+ {size}+ </Select.Item>+ );+ })}+ </Select.Content>+ </Select.Root>+ );+};diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsxindex 71a5c44..69f98bf 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx@@ -24,6 +24,11 @@ export const PopupLinkButton: React.FC<PopupLinkButtonProps> = ({<ToolButtonclassName={classNames(`property-button`)}visible={true}+ selected={+ appState.linkState?.isEditing ||+ appState.linkState?.isHovering ||+ appState.linkState?.isHoveringOrigin+ }icon={LinkIcon}type="button"title={title}diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scssindex 1b5ac5c..83c23a9 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.scss@@ -1,4 +1,66 @@.popup-toolbar {+ .popup-font-size {+ height: var(--lg-button-size);+ display: flex;+ align-items: center;+ gap: 2px;+ padding: 0 4px 0 4px;+ border-radius: var(--border-radius-sm);+ background-color: var(--color-surface-secondary-container);+ color: var(--color-on-surface);+ &:not([data-disable-hover]):hover {+ background-color: var(--color-surface-primary-container);+ }+ .popup-font-size__input {+ width: 36px;+ height: 100%;+ border: none;+ outline: none;+ padding: 0;+ background: transparent;+ color: inherit;+ font-size: 14px;+ text-align: center;+ appearance: textfield;+ -moz-appearance: textfield;+ &::-webkit-outer-spin-button,+ &::-webkit-inner-spin-button {+ -webkit-appearance: none;+ margin: 0;+ }+ }+ .popup-font-size__stepper {+ height: 100%;+ width: 16px;+ display: flex;+ flex-direction: column;+ align-items: stretch;+ justify-content: stretch;+ }+ .popup-font-size__stepper-button {+ flex: 1;+ border: 0;+ outline: none;+ padding: 0;+ background: transparent;+ color: inherit;+ cursor: pointer;+ display: flex;+ align-items: center;+ justify-content: center;+ }+ .popup-font-size__stepper-icon {+ width: 12px;+ height: 12px;+ display: block;+ }+ .popup-font-size__stepper-button:first-child .popup-font-size__stepper-icon {+ transform: translateY(0.5px);+ }+ .popup-font-size__stepper-button:last-child .popup-font-size__stepper-icon {+ transform: translateY(-0.5px);+ }+ }.property-button {height: var(--lg-button-size);width: var(--lg-button-size);@@ -29,7 +91,6 @@}}}-.stroke-setting {&.has-stroke-style {padding-top: 8px !important;@@ -42,4 +103,4 @@.source-arrow-island .property-button ,.source-arrow-button{transform: rotateY(180deg);-}\ No newline at end of file+}diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsxindex b062c81..8faaa30 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/popup-toolbar.tsx@@ -36,6 +36,7 @@ import {import { CustomText, StrokeStyle } from '@plait/common';import { getTextMarksByElement } from '@plait/text-plugins';import { PopupFontColorButton } from './font-color-button';+import { PopupFontSizeControl } from './font-size-control';import { PopupStrokeButton } from './stroke-button';import { PopupFillButton } from './fill-button';import { isWhite, removeHexAlpha } from '../../../utils/color';@@ -181,6 +182,14 @@ export const PopupToolbar = () => {style={floatingStyles}><Stack.Row gap={1}>+ {state.hasText && (+ <PopupFontSizeControl+ board={board}+ key={'font-size'}+ currentFontSize={getFontSizeFromMarks(state.marks)}+ title={t('popupToolbar.fontSize')}+ />+ )}{state.hasFontColor && (<PopupFontColorButtonboard={board}@@ -261,7 +270,7 @@ export const getMindElementState = (return {fill: element.fill,strokeColor: getStrokeColorByMindElement(board, element),- strokeStyle:getStrokeStyleByElement(board, element),+ strokeStyle: getStrokeStyleByElement(board, element),marks,};};@@ -351,3 +360,9 @@ export const getColorPropertyValue = (color: string) => {return color;}};++const getFontSizeFromMarks = (marks?: Omit<CustomText, 'text'>) => {+ const value = (marks as any)?.['font-size'];+ const size = typeof value === 'number' ? value : Number(value);+ return Number.isFinite(size) && size > 0 ? size : undefined;+};diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsxindex 115a125..eb9663c 100644--- a/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/stroke-button.tsx@@ -73,6 +73,7 @@ export const PopupStrokeButton: React.FC<PopupStrokeButtonProps> = ({<ToolButtonclassName={classNames(`property-button`)}visible={true}+ selected={isStrokePropertyOpen}icon={icon}type="button"title={title}@@ -98,9 +99,7 @@ export const PopupStrokeButton: React.FC<PopupStrokeButtonProps> = ({<Stack.Row className={classNames('stroke-style-picker')}><ToolButtonvisible={true}- selected={- !currentStyle || currentStyle === StrokeStyle.solid- }+ selected={!currentStyle || currentStyle === StrokeStyle.solid}icon={StrokeStyleNormalIcon}type="button"title={`${title} — ${t('stroke.solid')}`}diff --git a/packages/drawnix/src/i18n/translations/ar.ts b/packages/drawnix/src/i18n/translations/ar.tsindex 685aa94..d1474cf 100644--- a/packages/drawnix/src/i18n/translations/ar.ts+++ b/packages/drawnix/src/i18n/translations/ar.ts@@ -118,6 +118,7 @@ const arTranslations: Translations = {// Tool popup items"popupToolbar.fillColor": "لون التعبئة",+ "popupToolbar.fontSize": "حجم الخط","popupToolbar.fontColor": "لون الخط","popupToolbar.link": "إدراج رابط","popupToolbar.stroke": "الحد",diff --git a/packages/drawnix/src/i18n/translations/en.ts b/packages/drawnix/src/i18n/translations/en.tsindex 0eafb4e..54b2702 100644--- a/packages/drawnix/src/i18n/translations/en.ts+++ b/packages/drawnix/src/i18n/translations/en.ts@@ -120,6 +120,7 @@ const enTranslations: Translations = {// Tool popup items'popupToolbar.fillColor': 'Fill Color',+ 'popupToolbar.fontSize': 'Font Size','popupToolbar.fontColor': 'Font Color','popupToolbar.link': 'Insert Link','popupToolbar.stroke': 'Stroke',diff --git a/packages/drawnix/src/i18n/translations/ru.ts b/packages/drawnix/src/i18n/translations/ru.tsindex 5c136d0..6b2ecb1 100644--- a/packages/drawnix/src/i18n/translations/ru.ts+++ b/packages/drawnix/src/i18n/translations/ru.ts@@ -123,6 +123,7 @@ const ruTranslations: Translations = {// Tool popup items'popupToolbar.fillColor': 'Цвет заливки',+ 'popupToolbar.fontSize': 'Размер шрифта','popupToolbar.fontColor': 'Цвет текста','popupToolbar.link': 'Вставить ссылку','popupToolbar.stroke': 'Контур',diff --git a/packages/drawnix/src/i18n/translations/vi.ts b/packages/drawnix/src/i18n/translations/vi.tsindex f306b8c..fd550e5 100644--- a/packages/drawnix/src/i18n/translations/vi.ts+++ b/packages/drawnix/src/i18n/translations/vi.ts@@ -121,6 +121,7 @@ const viTranslations: Translations = {// Tool popup items'popupToolbar.fillColor': 'Màu tô',+ 'popupToolbar.fontSize': 'Cỡ chữ','popupToolbar.fontColor': 'Màu chữ','popupToolbar.link': 'Chèn liên kết','popupToolbar.stroke': 'Đường viền',diff --git a/packages/drawnix/src/i18n/translations/zh.ts b/packages/drawnix/src/i18n/translations/zh.tsindex 60d7149..19610a3 100644--- a/packages/drawnix/src/i18n/translations/zh.ts+++ b/packages/drawnix/src/i18n/translations/zh.ts@@ -117,6 +117,7 @@ const zhTranslations: Translations = {// Tool popup items'popupToolbar.fillColor': '填充颜色',+ 'popupToolbar.fontSize': '字号','popupToolbar.fontColor': '字体颜色','popupToolbar.link': '链接','popupToolbar.stroke': '边框',diff --git a/packages/drawnix/src/i18n/types.ts b/packages/drawnix/src/i18n/types.tsindex c63012b..51f51f5 100644--- a/packages/drawnix/src/i18n/types.ts+++ b/packages/drawnix/src/i18n/types.ts@@ -122,6 +122,7 @@ export interface Translations {// Tool popup items'popupToolbar.fillColor': string;+ 'popupToolbar.fontSize': string;'popupToolbar.fontColor': string;'popupToolbar.link': string;'popupToolbar.stroke': string;diff --git a/packages/drawnix/src/styles/theme.scss b/packages/drawnix/src/styles/theme.scssindex de1141a..8fce1bf 100644--- a/packages/drawnix/src/styles/theme.scss+++ b/packages/drawnix/src/styles/theme.scss@@ -28,6 +28,16 @@}--space-factor: 0.25rem;+ --dx-space-1: 4px;+ --dx-space-2: 8px;+ --dx-space-3: 12px;+ --dx-space-4: 16px;+ --dx-space-5: 24px;+ --dx-radius-1: 3px;+ --dx-radius-2: 4px;+ --dx-radius-3: 6px;+ --dx-radius-4: 8px;+ --dx-radius-full: 9999px;--text-primary-color: var(--color-on-surface);--color-icon-white: #{$oc-white};diff --git a/packages/drawnix/src/transforms/property.ts b/packages/drawnix/src/transforms/property.tsindex 54a2606..678d695 100644--- a/packages/drawnix/src/transforms/property.ts+++ b/packages/drawnix/src/transforms/property.ts@@ -20,7 +20,7 @@ import {getCurrentStrokeColor,isClosedElement,} from '../utils/property';-import { TextTransforms } from '@plait/text-plugins';+import { DEFAULT_FONT_SIZE, TextTransforms } from '@plait/text-plugins';export const setFillColorOpacity = (board: PlaitBoard, fillOpacity: number) => {PropertyTransforms.setFillColor(board, null, {@@ -141,3 +141,10 @@ export const setTextColorOpacity = (: applyOpacityToHex(currentFontColorValue, opacity);TextTransforms.setTextColor(board, newFontColor);};++export const setTextFontSize = (board: PlaitBoard, size: number) => {+ if (!Number.isFinite(size) || size <= 0) {+ return;+ }+ TextTransforms.setFontSize(board, String(size) as any, DEFAULT_FONT_SIZE);+};diff --git a/packages/react-text/src/styles/index.scss b/packages/react-text/src/styles/index.scssindex bc76fc7..b2197c0 100644--- a/packages/react-text/src/styles/index.scss+++ b/packages/react-text/src/styles/index.scss@@ -31,4 +31,25 @@user-select: text;}}+ [plait-underlined][plait-strike] {+ text-decoration: underline line-through;+ }+ [plait-strike] {+ text-decoration: line-through;+ }+ [plait-underlined] {+ text-decoration: underline;+ }+ [plait-italic] {+ font-style: italic;+ }+ [plait-bold] {+ font-weight: bold;+ }+ @for $size from 8 through 78 {+ [plait-font-size='#{$size}'] {+ font-size: #{$size}px;+ line-height: 1.5;+ }+ }}diff --git a/packages/react-text/src/text.tsx b/packages/react-text/src/text.tsxindex 3976359..ea2312a 100644--- a/packages/react-text/src/text.tsx+++ b/packages/react-text/src/text.tsx@@ -162,8 +162,18 @@ const Leaf: React.FC<RenderLeafProps> = ({ children, leaf, attributes }) => {if ((leaf as CustomText).underlined) {children = <u>{children}</u>;}++ const fontSizeValue = (leaf as CustomText)['font-size'];+ const style: CSSProperties = {+ color: (leaf as CustomText).color+ };+return (- <span style={{ color: (leaf as CustomText).color }} {...attributes}>+ <span+ style={style}+ {...attributes}+ {...({ 'plait-font-size': fontSizeValue } as any)}+ >{children}</span>);