@bifrostui/react 1.5.3 → 2.0.0-alpha.1

package/dist/Picker/Picker.js

@@ -59,12 +59,12 @@ __export(Picker_exports, {
   default: () => Picker_default
 });
 module.exports = __toCommonJS(Picker_exports);
-var import_clsx = __toESM(require("clsx"));
 var import_react = __toESM(require("react"));
+var import_clsx = __toESM(require("clsx"));
 var import_Drawer = __toESM(require("../Drawer"));
-var import_PickerPanel = __toESM(require("./PickerPanel"));
 var import_locales = require("../locales");
 var import_utils = require("./utils");
+var import_PickerPanel = __toESM(require("./PickerPanel"));
 var import_Picker2 = require("./Picker.css");
 const prefixCls = "bui-picker";
 const checkDisabled = (values, columns) => values.find(
@@ -234,35 +234,67 @@ const Picker = /* @__PURE__ */ import_react.default.forwardRef((props, ref) => {
       ref,
       open,
       className: (0, import_clsx.default)(prefixCls, className),
-      onClose: handleClose
+      onClose: handleClose,
+      role: "dialog",
+      "aria-modal": "true",
+      "aria-label": title || "Picker"
     }, others),
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       __spreadProps(__spreadValues({}, contentProps), {
         className: (0, import_clsx.default)(`${prefixCls}-content`, contentProps == null ? void 0 : contentProps.className)
       }),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-header` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-cancel`, onClick: cancel }, propCancelText || cancelText), title && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-title` }, title), /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
-          className: (0, import_clsx.default)(`${prefixCls}-confirm`, {
-            [`${prefixCls}-confirm-disabled`]: disabled
-          }),
-          onClick: confirm
+          className: `${prefixCls}-header`,
+          role: "toolbar",
+          "aria-label": "Toolbar"
         },
-        propConfirmText || confirmText
-      )),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-container` }, columns.map((column, index) => /* @__PURE__ */ import_react.default.createElement(
-        import_PickerPanel.default,
+        /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            className: `${prefixCls}-cancel`,
+            onClick: cancel,
+            "aria-label": "Cancel"
+          },
+          propCancelText || cancelText
+        ),
+        title && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-title`, role: "heading", "aria-level": 2 }, title),
+        /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            className: (0, import_clsx.default)(`${prefixCls}-confirm`, {
+              [`${prefixCls}-confirm-disabled`]: disabled
+            }),
+            onClick: confirm,
+            type: "button",
+            "aria-label": "Confirm",
+            tabIndex: disabled ? -1 : 0
+          },
+          propConfirmText || confirmText
+        )
+      ),
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
         {
-          ref: setRefs(index),
-          key: index,
-          options: column,
-          columnIndex: index,
-          value: internalValue == null ? void 0 : internalValue[index],
-          onSelect: handleSelect,
-          pickerStyle: others == null ? void 0 : others.style
-        }
-      )))
+          className: `${prefixCls}-container`,
+          role: "listbox",
+          "aria-label": "Options"
+        },
+        columns.map((column, index) => /* @__PURE__ */ import_react.default.createElement(
+          import_PickerPanel.default,
+          {
+            ref: setRefs(index),
+            key: index,
+            options: column,
+            columnIndex: index,
+            value: internalValue == null ? void 0 : internalValue[index],
+            onSelect: handleSelect,
+            open
+          }
+        ))
+      )
     )
   );
 });

package/dist/Picker/PickerPanel.css

@@ -9,9 +9,9 @@
   transform: rotate3d(1, 0, 0, 60deg);
   transform-style: preserve-3d;
   position: absolute;
-  top: var(--indicator-top);
+  top: var(--bui-picker-indicator-top);
   width: 100%;
-  height: var(--option-height);
+  height: var(--bui-picker-option-height);
 }
 .bui-picker-panel-mask {
   position: absolute;
@@ -29,14 +29,14 @@
       var(--bui-color-bg-alpha-light-9),
       var(--bui-color-bg-alpha-light-3));
   background-position: top, bottom;
-  background-size: 100% var(--indicator-top);
+  background-size: 100% var(--bui-picker-indicator-top);
   background-repeat: no-repeat;
   transform: translateZ(0);
 }
 .bui-picker-panel-indicator {
   position: absolute;
-  top: var(--indicator-top);
-  height: var(--option-height);
+  top: var(--bui-picker-indicator-top);
+  height: var(--bui-picker-option-height);
   width: 100%;
   border-top: 1px solid var(--bui-color-border-default);
   border-bottom: 1px solid var(--bui-color-border-default);
@@ -46,10 +46,10 @@
   top: 0;
   left: 0;
   text-align: center;
-  height: var(--option-height);
-  line-height: var(--option-height);
+  height: var(--bui-picker-option-height);
+  line-height: var(--bui-picker-option-height);
   color: var(--bui-color-fg-default);
-  font-size: var(--option-font-size);
+  font-size: var(--bui-picker-option-font-size);
   backface-visibility: hidden;
   width: auto;
   overflow: hidden;

package/dist/Picker/PickerPanel.js

@@ -56,38 +56,36 @@ __export(PickerPanel_exports, {
   default: () => PickerPanel_default
 });
 module.exports = __toCommonJS(PickerPanel_exports);
-var import_clsx = __toESM(require("clsx"));
 var import_react = __toESM(require("react"));
+var import_clsx = __toESM(require("clsx"));
 var import_utils = require("@bifrostui/utils");
 var import_PickerPanel = require("./PickerPanel.css");
 const prefixCls = "bui-picker-panel";
+const INERTIA_TIME = 200;
+const INERTIA_DISTANCE = 15;
+const DEFAULT_DURATION = 200;
+const ROTATION = 20;
+const TOUCH_END = "end";
+const DEFAULT_LINE_SPACING = 36;
 const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
   (props, ref) => {
-    var _b;
     const _a = props, {
       options = [],
       value,
       onSelect,
       columnIndex,
-      pickerStyle
+      open
     } = _a, others = __objRest(_a, [
       "options",
       "value",
       "onSelect",
       "columnIndex",
-      "pickerStyle"
+      "open"
     ]);
     const touch = (0, import_utils.useTouch)();
-    let timer;
-    const INERTIA_TIME = 200;
-    const INERTIA_DISTANCE = 15;
-    const DEFAULT_DURATION = 200;
-    const ROTATION = 20;
-    const TOUCH_END = "end";
-    const DEFAULT_LINE_SPACING = 36;
-    const LINE_SPACING_STR = (_b = ((pickerStyle == null ? void 0 : pickerStyle["--option-height"]) ? `${pickerStyle == null ? void 0 : pickerStyle["--option-height"]}` : `${DEFAULT_LINE_SPACING}`).match(/\d+/)) == null ? void 0 : _b[0];
-    const LINE_SPACING = parseInt(LINE_SPACING_STR, 10);
-    const INDICATOR_OFFSET = LINE_SPACING * 108 / DEFAULT_LINE_SPACING;
+    const timerRef = (0, import_react.useRef)(null);
+    const lineSpacing = (0, import_react.useRef)(DEFAULT_LINE_SPACING);
+    const [indicatorOffset, setIndicatorOffset] = (0, import_react.useState)(108);
     const [startY, setStartY] = (0, import_react.useState)(0);
     const [currIndex, setCurrIndex] = (0, import_react.useState)(1);
     const [startTime, setStartTime] = (0, import_react.useState)(0);
@@ -96,33 +94,18 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
     const [scrollDistance, setScrollDistance] = (0, import_react.useState)(0);
     const transformY = (0, import_react.useRef)(0);
     const isVerticalMoving = (0, import_react.useRef)(false);
-    const rollerRef = (0, import_react.useRef)(null);
+    const fitstOptionRef = (0, import_react.useRef)(null);
     const PickerPanelRef = (0, import_react.useRef)(null);
     const pickerPanelRef = (0, import_utils.useForkRef)(PickerPanelRef, ref);
     (0, import_utils.useTouchEmulator)(PickerPanelRef.current);
-    const updateSelect = () => {
-      let index = -1;
-      if (value) {
-        options.some((item, idx) => {
-          if (item.value === value) {
-            index = idx;
-            return true;
-          }
-          return false;
-        });
-      }
-      setCurrIndex(index === -1 ? 1 : index + 1);
-      const move = index === -1 ? 0 : index * LINE_SPACING;
-      setMove({ move: -move });
-    };
-    (0, import_react.useEffect)(() => {
-      setScrollDistance(0);
-      transformY.current = 0;
-      updateSelect();
-      return () => {
-        clearTimeout(timer);
-      };
-    }, [options, value]);
+    (0, import_react.useLayoutEffect)(() => {
+      if (!open)
+        return;
+      (0, import_utils.getBoundingClientRect)(fitstOptionRef.current).then((rect) => {
+        lineSpacing.current = (rect == null ? void 0 : rect.height) || DEFAULT_LINE_SPACING;
+        setIndicatorOffset(lineSpacing.current * 108 / DEFAULT_LINE_SPACING);
+      });
+    }, [open]);
     const setTransform = (type, deg, time = DEFAULT_DURATION, translateY = 0) => {
       let nTime = time;
       if (type !== TOUCH_END) {
@@ -139,25 +122,50 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
         if (updateMove > 0) {
           updateMove = 0;
         }
-        if (updateMove < -(options.length - 1) * LINE_SPACING) {
-          updateMove = -(options.length - 1) * LINE_SPACING;
+        if (updateMove < -(options.length - 1) * lineSpacing.current) {
+          updateMove = -(options.length - 1) * lineSpacing.current;
         }
-        const endMove = Math.round(updateMove / LINE_SPACING) * LINE_SPACING;
-        const deg = `${(Math.abs(Math.round(endMove / LINE_SPACING)) + 1) * ROTATION}deg`;
+        const endMove = Math.round(updateMove / lineSpacing.current) * lineSpacing.current;
+        const deg = `${(Math.abs(Math.round(endMove / lineSpacing.current)) + 1) * ROTATION}deg`;
         setTransform(type, deg, time, endMove);
-        setCurrIndex(Math.abs(Math.round(endMove / LINE_SPACING)) + 1);
+        setCurrIndex(Math.abs(Math.round(endMove / lineSpacing.current)) + 1);
       } else {
         let deg = 0;
-        const currentDeg = (-updateMove / LINE_SPACING + 1) * ROTATION;
+        const currentDeg = (-updateMove / lineSpacing.current + 1) * ROTATION;
         const maxDeg = (options.length + 1) * ROTATION;
         const minDeg = 0;
         deg = Math.min(Math.max(currentDeg, minDeg), maxDeg);
         if (minDeg < deg && deg < maxDeg) {
           setTransform("", `${deg}deg`, void 0, updateMove);
-          setCurrIndex(Math.abs(Math.round(updateMove / LINE_SPACING)) + 1);
+          setCurrIndex(
+            Math.abs(Math.round(updateMove / lineSpacing.current)) + 1
+          );
         }
       }
     };
+    const updateSelect = () => {
+      let index = -1;
+      if (value) {
+        options.some((item, idx) => {
+          if (item.value === value) {
+            index = idx;
+            return true;
+          }
+          return false;
+        });
+      }
+      setCurrIndex(index === -1 ? 1 : index + 1);
+      const move = index === -1 ? 0 : index * lineSpacing.current;
+      setMove({ move: -move });
+    };
+    (0, import_react.useEffect)(() => {
+      setScrollDistance(0);
+      transformY.current = 0;
+      updateSelect();
+      return () => {
+        clearTimeout(timerRef.current);
+      };
+    }, [options, value]);
     const momentum = (distance, duration) => {
       let nDistance = distance;
       const speed = Math.abs(nDistance / duration);
@@ -198,39 +206,42 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
           type: TOUCH_END
         });
       }
-      timer = setTimeout(() => {
+      timerRef.current = setTimeout(() => {
         touch.reset();
       }, 0);
     };
     (0, import_react.useEffect)(() => {
-      var _a2, _b2, _c;
+      var _a2, _b, _c;
       (_a2 = PickerPanelRef.current) == null ? void 0 : _a2.addEventListener("touchstart", panelTouchStart);
-      (_b2 = PickerPanelRef.current) == null ? void 0 : _b2.addEventListener("touchmove", panelTouchMove);
+      (_b = PickerPanelRef.current) == null ? void 0 : _b.addEventListener("touchmove", panelTouchMove);
       (_c = PickerPanelRef.current) == null ? void 0 : _c.addEventListener("touchend", panelTouchEnd);
       return () => {
-        var _a3, _b3, _c2;
+        var _a3, _b2, _c2;
         (_a3 = PickerPanelRef.current) == null ? void 0 : _a3.removeEventListener(
           "touchstart",
           panelTouchStart
         );
-        (_b3 = PickerPanelRef.current) == null ? void 0 : _b3.removeEventListener(
+        (_b2 = PickerPanelRef.current) == null ? void 0 : _b2.removeEventListener(
           "touchmove",
           panelTouchMove
         );
         (_c2 = PickerPanelRef.current) == null ? void 0 : _c2.removeEventListener("touchend", panelTouchEnd);
       };
-    });
+    }, [panelTouchStart, panelTouchMove, panelTouchEnd]);
     const onTransitionEnd = (e) => {
       isVerticalMoving.current = false;
       setTouchTime(0);
       onSelect == null ? void 0 : onSelect(e, {
-        columnOption: options == null ? void 0 : options[Math.round(-scrollDistance / LINE_SPACING)],
+        columnOption: options == null ? void 0 : options[Math.round(-scrollDistance / lineSpacing.current)],
         columnIndex
       });
     };
-    (0, import_react.useImperativeHandle)(ref, () => ({
-      isMoving: isVerticalMoving.current
-    }));
+    (0, import_react.useImperativeHandle)(
+      ref,
+      () => ({
+        isMoving: isVerticalMoving.current
+      })
+    );
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       __spreadValues({
@@ -238,13 +249,16 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
         ref: pickerPanelRef,
         onTouchStart: panelTouchStart,
         onTouchMove: panelTouchMove,
-        onTouchEnd: panelTouchEnd
+        onTouchEnd: panelTouchEnd,
+        role: "listbox",
+        "aria-label": "options",
+        "aria-orientation": "vertical",
+        tabIndex: 0
       }, others),
       /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           className: `${prefixCls}-roller`,
-          ref: rollerRef,
           style: {
             transition: `transform ${touchTime}ms cubic-bezier(0.17, 0.89, 0.45, 1)`,
             transform: `rotate3d(1, 0, 0, ${touchDeg})`
@@ -254,14 +268,21 @@ const PickerPanel = /* @__PURE__ */ import_react.default.forwardRef(
         options.map((item, i) => /* @__PURE__ */ import_react.default.createElement(
           "div",
           {
+            ref: (el) => {
+              if (i === 0 && !fitstOptionRef.current)
+                fitstOptionRef.current = el;
+            },
             className: (0, import_clsx.default)(`${prefixCls}-option`, {
               [`${prefixCls}-option-hidden`]: i + 1 <= currIndex - 8 || i + 1 >= currIndex + 8,
               [`${prefixCls}-option-disabled`]: item == null ? void 0 : item.disabled
             }),
             key: `${item == null ? void 0 : item.value}-${i}`,
             style: {
-              transform: `rotate3d(1, 0, 0, ${-ROTATION * (i + 1)}deg) translate3d(0px, 0px, ${INDICATOR_OFFSET}px)`
-            }
+              transform: `rotate3d(1, 0, 0, ${-ROTATION * (i + 1)}deg) translate3d(0px, 0px, ${indicatorOffset}px)`
+            },
+            role: "option",
+            "aria-selected": item.value === value,
+            "aria-disabled": !!(item == null ? void 0 : item.disabled)
           },
           item == null ? void 0 : item.label
         ))

package/dist/Picker/__tests__/fixtures/A11yDemos.js

@@ -0,0 +1,79 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var A11yDemos_exports = {};
+__export(A11yDemos_exports, {
+  CalendarDemo: () => CalendarDemo
+});
+module.exports = __toCommonJS(A11yDemos_exports);
+var import_react = __toESM(require("react"));
+var import_Picker = __toESM(require("../../Picker"));
+const CalendarDemo = () => {
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_Picker.default,
+    {
+      open: true,
+      value: [2],
+      options: [
+        [
+          {
+            value: 1,
+            label: "\u5468\u4E00"
+          },
+          {
+            value: 2,
+            label: "\u5468\u4E8C"
+          },
+          {
+            value: 3,
+            label: "\u5468\u4E09"
+          },
+          {
+            value: 4,
+            label: "\u5468\u56DB"
+          },
+          {
+            value: 5,
+            label: "\u5468\u4E94"
+          },
+          {
+            value: 6,
+            label: "\u5468\u516D"
+          },
+          {
+            value: 7,
+            label: "\u5468\u65E5"
+          }
+        ]
+      ]
+    }
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  CalendarDemo
+});

package/dist/Picker/index.css

@@ -0,0 +1,124 @@
+:root,
+page,
+xhs-page {
+  --bui-picker-header-height: 50px;
+  --bui-picker-header-padding: 0 var(--bui-spacing-lg);
+  --bui-picker-cancel-height: 100%;
+  --bui-picker-cancel-line-height: 50px;
+  --bui-picker-confirm-height: 100%;
+  --bui-picker-confirm-line-height: 50px;
+  --bui-picker-panel-height: 260px;
+  --bui-picker-indicator-top: 108px;
+  --bui-picker-option-height: 36px;
+  --bui-picker-option-font-size: var(--bui-title-size-4);
+}
+.bui-picker {
+  font-family: var(--bui-font-family);
+}
+.bui-picker .bui-drawer-content {
+  border-radius: var(--bui-shape-radius-drawer) var(--bui-shape-radius-drawer) 0 0;
+}
+.bui-picker-header {
+  height: var(--bui-picker-header-height);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: var(--bui-picker-header-padding);
+}
+.bui-picker-cancel {
+  cursor: pointer;
+  height: var(--bui-picker-cancel-height);
+  font-size: var(--bui-title-size-4);
+  text-align: center;
+  line-height: var(--bui-picker-cancel-line-height);
+  color: var(--bui-color-fg-default);
+}
+.bui-picker-title {
+  font-size: var(--bui-title-size-3);
+  color: var(--bui-color-fg-default);
+  font-weight: var(--bui-font-weight-medium);
+}
+.bui-picker-confirm {
+  cursor: pointer;
+  height: var(--bui-picker-confirm-height);
+  font-size: var(--bui-title-size-4);
+  text-align: center;
+  line-height: var(--bui-picker-confirm-line-height);
+  color: var(--bui-color-primary);
+}
+.bui-picker-confirm-disabled {
+  color: var(--bui-color-fg-default);
+  opacity: var(--bui-picker-confirm-disabled-opacity);
+}
+.bui-picker-container {
+  width: 100%;
+  height: var(--bui-picker-panel-height);
+  display: flex;
+  overflow: hidden;
+}
+.bui-picker-panel {
+  --bui-picker-option-disabled-opacity: 0.38;
+  flex: 1;
+  flex-shrink: 0;
+  position: relative;
+  font-family: var(--bui-font-family);
+}
+.bui-picker-panel-roller {
+  transform: rotate3d(1, 0, 0, 60deg);
+  transform-style: preserve-3d;
+  position: absolute;
+  top: var(--bui-picker-indicator-top);
+  width: 100%;
+  height: var(--bui-picker-option-height);
+}
+.bui-picker-panel-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-image:
+    linear-gradient(
+      180deg,
+      var(--bui-color-bg-alpha-light-9),
+      var(--bui-color-bg-alpha-light-3)),
+    linear-gradient(
+      0deg,
+      var(--bui-color-bg-alpha-light-9),
+      var(--bui-color-bg-alpha-light-3));
+  background-position: top, bottom;
+  background-size: 100% var(--bui-picker-indicator-top);
+  background-repeat: no-repeat;
+  transform: translateZ(0);
+}
+.bui-picker-panel-indicator {
+  position: absolute;
+  top: var(--bui-picker-indicator-top);
+  height: var(--bui-picker-option-height);
+  width: 100%;
+  border-top: 1px solid var(--bui-color-border-default);
+  border-bottom: 1px solid var(--bui-color-border-default);
+}
+.bui-picker-panel-option {
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  height: var(--bui-picker-option-height);
+  line-height: var(--bui-picker-option-height);
+  color: var(--bui-color-fg-default);
+  font-size: var(--bui-picker-option-font-size);
+  backface-visibility: hidden;
+  width: auto;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 100%;
+}
+.bui-picker-panel-option-disabled {
+  opacity: var(--bui-picker-option-disabled-opacity);
+}
+.bui-picker-panel-option-hidden {
+  visibility: hidden;
+  opacity: 0;
+}

package/dist/Picker/utils.js

@@ -56,14 +56,11 @@ const formatCascade = (columns, values) => {
 };
 const formatOptions = (internalValue, options = []) => {
   const panelType = pickerPanelType(options);
-  switch (panelType) {
-    case "multiple":
-      return options;
-    case "cascade":
-      return formatCascade(options, internalValue);
-    default:
-      return options;
-  }
+  if (panelType === "multiple")
+    return options;
+  if (panelType === "cascade")
+    return formatCascade(options, internalValue);
+  return options;
 };
 const existSameLengthValue = (value, formatted) => {
   const result = formatted.every(
@@ -73,22 +70,22 @@ const existSameLengthValue = (value, formatted) => {
 };
 const safeData = ({ value, formatted, options }) => {
   let safeValue = [];
-  let safeFormatted = [];
+  let safeFormattedValue = [];
   const existValidChildren = existSameLengthValue(value, formatted);
   if (existValidChildren) {
     safeValue = value;
-    safeFormatted = formatted;
+    safeFormattedValue = formatted;
   } else {
     formatted.forEach((item, index) => {
       var _a, _b;
       const childIndex = item.findIndex((i) => i.value === value[index]);
       safeValue[index] = ((_a = item == null ? void 0 : item[childIndex]) == null ? void 0 : _a.value) || ((_b = item == null ? void 0 : item[0]) == null ? void 0 : _b.value);
     });
-    safeFormatted = formatOptions(safeValue, options);
+    safeFormattedValue = formatOptions(safeValue, options);
   }
   return {
     safeValue,
-    safeFormatted
+    safeFormattedValue
   };
 };
 // Annotate the CommonJS export names for ESM import in node: