@sunggang/ui-lib 0.4.32 → 0.4.34

package/BaseCkeditor.cjs.js

@@ -2694,7 +2694,7 @@ function _create_class$1(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties$1(Constructor, staticProps);
     return Constructor;
 }
-function _define_property(obj, key, value) {
+function _define_property$1(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -2769,7 +2769,7 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _object_spread(target) {
+function _object_spread$1(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -2779,7 +2779,7 @@ function _object_spread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
+            _define_property$1(target, key, source[key]);
         });
     }
     return target;
@@ -3038,7 +3038,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                             }
                         }
                     }
-                    var updatedConfig = _object_spread_props(_object_spread({}, _this._config), {
+                    var updatedConfig = _object_spread_props(_object_spread$1({}, _this._config), {
                         extraPlugins: _this._config.extraPlugins || [],
                         lazyRoots: lazyRoots,
                         rootsAttributes: rootsAttributes,
@@ -3432,7 +3432,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                     var startPosition = writer.createPositionFromPath(root, start.path, start.stickiness);
                     var endPosition = writer.createPositionFromPath(root, end.path, end.stickiness);
                     var range = writer.createRange(startPosition, endPosition);
-                    writer.addMarker(markerName, _object_spread({
+                    writer.addMarker(markerName, _object_spread$1({
                         range: range
                     }, options));
                 });
@@ -3454,7 +3454,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                         var commentThread = commentsRepository.getCommentThread(commentThreadData.threadId);
                         commentThread.remove();
                     }
-                    commentsRepository.addCommentThread(_object_spread({
+                    commentsRepository.addCommentThread(_object_spread$1({
                         channelId: channelId
                     }, commentThreadData));
                 });
@@ -66777,10 +66777,48 @@ function _ts_values(o) {
 
 var Editor = /*@__PURE__*/_commonjsHelpers.getDefaultExportFromCjs(ckeditor.exports);
 
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
 var BaseCkeditor = function(param) {
-    var item = param.item, config = param.config;
+    var item = param.item, _param_config = param.config, config = _param_config === void 0 ? {} : _param_config;
     var _item_validateOption;
     var _useFormContext = index_esm.useFormContext(), control = _useFormContext.control, errors = _useFormContext.formState.errors;
+    // 確保配置對象是安全的
+    var safeConfig = _object_spread({
+        uploadUrl: "",
+        fieldName: "",
+        authToken: ""
+    }, config);
+    // 確保 customUpload 配置是一個有效對象
+    var editorConfig = {
+        customUpload: (item === null || item === void 0 ? void 0 : item.config) || safeConfig
+    };
     return /*#__PURE__*/ jsxRuntime.jsx(index_esm.Controller, {
         name: item === null || item === void 0 ? void 0 : item.name,
         control: control,
@@ -66801,9 +66839,7 @@ var BaseCkeditor = function(param) {
                     /*#__PURE__*/ jsxRuntime.jsx(dist.exports.CKEditor, {
                         editor: Editor,
                         data: value,
-                        config: {
-                            customUpload: config || (item === null || item === void 0 ? void 0 : item.config) || {}
-                        },
+                        config: editorConfig,
                         onChange: function(_, editor) {
                             var data = editor.getData();
                             onChange(data);
@@ -66837,12 +66873,6 @@ var BaseCkeditor = function(param) {
     });
 };
 
-var BaseCkeditor$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    'default': BaseCkeditor
-});
-
 exports.BaseCkeditor = BaseCkeditor;
-exports.BaseCkeditor$1 = BaseCkeditor$1;
 exports.Editor = Editor;
 exports.dist = dist;

package/BaseCkeditor.esm.js

@@ -2688,7 +2688,7 @@ function _create_class$1(Constructor, protoProps, staticProps) {
     if (staticProps) _defineProperties$1(Constructor, staticProps);
     return Constructor;
 }
-function _define_property(obj, key, value) {
+function _define_property$1(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
             value: value,
@@ -2763,7 +2763,7 @@ function _iterable_to_array_limit(arr, i) {
 function _non_iterable_rest() {
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _object_spread(target) {
+function _object_spread$1(target) {
     for(var i = 1; i < arguments.length; i++){
         var source = arguments[i] != null ? arguments[i] : {};
         var ownKeys = Object.keys(source);
@@ -2773,7 +2773,7 @@ function _object_spread(target) {
             }));
         }
         ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
+            _define_property$1(target, key, source[key]);
         });
     }
     return target;
@@ -3032,7 +3032,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                             }
                         }
                     }
-                    var updatedConfig = _object_spread_props(_object_spread({}, _this._config), {
+                    var updatedConfig = _object_spread_props(_object_spread$1({}, _this._config), {
                         extraPlugins: _this._config.extraPlugins || [],
                         lazyRoots: lazyRoots,
                         rootsAttributes: rootsAttributes,
@@ -3426,7 +3426,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                     var startPosition = writer.createPositionFromPath(root, start.path, start.stickiness);
                     var endPosition = writer.createPositionFromPath(root, end.path, end.stickiness);
                     var range = writer.createRange(startPosition, endPosition);
-                    writer.addMarker(markerName, _object_spread({
+                    writer.addMarker(markerName, _object_spread$1({
                         range: range
                     }, options));
                 });
@@ -3448,7 +3448,7 @@ var EditorWatchdog = /*#__PURE__*/ function(Watchdog) {
                         var commentThread = commentsRepository.getCommentThread(commentThreadData.threadId);
                         commentThread.remove();
                     }
-                    commentsRepository.addCommentThread(_object_spread({
+                    commentsRepository.addCommentThread(_object_spread$1({
                         channelId: channelId
                     }, commentThreadData));
                 });
@@ -66771,10 +66771,48 @@ function _ts_values(o) {
 
 var Editor = /*@__PURE__*/getDefaultExportFromCjs(ckeditor.exports);
 
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
 var BaseCkeditor = function(param) {
-    var item = param.item, config = param.config;
+    var item = param.item, _param_config = param.config, config = _param_config === void 0 ? {} : _param_config;
     var _item_validateOption;
     var _useFormContext = useFormContext(), control = _useFormContext.control, errors = _useFormContext.formState.errors;
+    // 確保配置對象是安全的
+    var safeConfig = _object_spread({
+        uploadUrl: "",
+        fieldName: "",
+        authToken: ""
+    }, config);
+    // 確保 customUpload 配置是一個有效對象
+    var editorConfig = {
+        customUpload: (item === null || item === void 0 ? void 0 : item.config) || safeConfig
+    };
     return /*#__PURE__*/ jsx(Controller, {
         name: item === null || item === void 0 ? void 0 : item.name,
         control: control,
@@ -66795,9 +66833,7 @@ var BaseCkeditor = function(param) {
                     /*#__PURE__*/ jsx(dist.exports.CKEditor, {
                         editor: Editor,
                         data: value,
-                        config: {
-                            customUpload: config || (item === null || item === void 0 ? void 0 : item.config) || {}
-                        },
+                        config: editorConfig,
                         onChange: function(_, editor) {
                             var data = editor.getData();
                             onChange(data);
@@ -66831,9 +66867,4 @@ var BaseCkeditor = function(param) {
     });
 };
 
-var BaseCkeditor$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    'default': BaseCkeditor
-});
-
-export { BaseCkeditor as B, Editor as E, BaseCkeditor$1 as a, dist as d };
+export { BaseCkeditor as B, Editor as E, dist as d };

package/Form.cjs.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var dynamic = require('next/dynamic');
 var _extends = require('./extends.cjs.js');
 var memoizeOne_esm = require('./memoize-one.esm.cjs.js');
 var react = require('@emotion/react');
@@ -22,6 +21,7 @@ var utils = require('./utils.cjs.js');
 var flatpickr = require('flatpickr');
 var Mandarin = require('flatpickr/dist/l10n/zh-tw.js');
 var useInjectCSS = require('./useInjectCSS.cjs.js');
+var BaseCkeditor$1 = require('./BaseCkeditor.cjs.js');
 require('./_tslib.cjs.js');
 require('./_commonjsHelpers.cjs.js');
 require('@radix-ui/react-switch');
@@ -29,6 +29,7 @@ require('@radix-ui/react-select');
 require('@radix-ui/react-icons');
 require('clsx');
 require('tailwind-merge');
+require('./index.cjs2.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -52,7 +53,6 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var dynamic__default = /*#__PURE__*/_interopDefaultLegacy(dynamic);
 var flatpickr__default = /*#__PURE__*/_interopDefaultLegacy(flatpickr);
 var Mandarin__default = /*#__PURE__*/_interopDefaultLegacy(Mandarin);
 
@@ -7467,11 +7467,24 @@ function _unsupported_iterable_to_array$2(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$2(o, minLen);
 }
-var BaseCkeditor = dynamic__default["default"](function() {
-    return Promise.resolve().then(function () { return require('./BaseCkeditor.cjs.js'); }).then(function (n) { return n.BaseCkeditor$1; });
-}, {
-    ssr: false
-});
+// 客戶端安全的 CKEditor 包裝器
+var BaseCkeditor = function(param) {
+    var item = param.item, config = param.config;
+    // 只在客戶端渲染 CKEditor
+    if (typeof window === "undefined") {
+        return /*#__PURE__*/ jsxRuntime.jsx("div", {
+            className: "p-4 border border-gray-200 rounded",
+            children: /*#__PURE__*/ jsxRuntime.jsx("p", {
+                className: "text-gray-500",
+                children: "Loading editor..."
+            })
+        });
+    }
+    return /*#__PURE__*/ jsxRuntime.jsx(BaseCkeditor$1.BaseCkeditor, {
+        item: item,
+        config: config
+    });
+};
 var TextField = function(param) {
     var item = param.item;
     var _useFormContext = index_esm.useFormContext(), register = _useFormContext.register, setValue = _useFormContext.setValue, errors = _useFormContext.formState.errors;

package/Form.esm.js

@@ -1,7 +1,6 @@
 import { jsxs, jsx as jsx$1, Fragment as Fragment$1 } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { useState, useCallback, useLayoutEffect, useContext, useRef, createContext, useMemo, Component, Fragment, useEffect, forwardRef, useImperativeHandle, createElement } from 'react';
-import dynamic from 'next/dynamic';
 import { b as _objectSpread2, d as _typeof, c as _defineProperty, _ as _extends } from './extends.esm.js';
 import { i as _objectWithoutProperties, j as _slicedToArray, b as _isNativeReflectConstruct, _ as _getPrototypeOf, a as _possibleConstructorReturn, m as memoizeOne, g as _inherits, k as _classCallCheck, l as _toConsumableArray, h as _createClass } from './memoize-one.esm.esm.js';
 import { keyframes, jsx, css as css$2 } from '@emotion/react';
@@ -20,6 +19,7 @@ import { c as cn } from './utils.esm.js';
 import flatpickr from 'flatpickr';
 import Mandarin from 'flatpickr/dist/l10n/zh-tw.js';
 import { u as useInjectGlobalCSS } from './useInjectCSS.esm.js';
+import { B as BaseCkeditor$1 } from './BaseCkeditor.esm.js';
 import './_tslib.esm.js';
 import './_commonjsHelpers.esm.js';
 import '@radix-ui/react-switch';
@@ -27,6 +27,7 @@ import '@radix-ui/react-select';
 import '@radix-ui/react-icons';
 import 'clsx';
 import 'tailwind-merge';
+import './index.esm2.js';
 
 var _excluded$6 = [
     "defaultInputValue",
@@ -7439,11 +7440,24 @@ function _unsupported_iterable_to_array$2(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array$2(o, minLen);
 }
-var BaseCkeditor = dynamic(function() {
-    return import('./BaseCkeditor.esm.js').then(function (n) { return n.a; });
-}, {
-    ssr: false
-});
+// 客戶端安全的 CKEditor 包裝器
+var BaseCkeditor = function(param) {
+    var item = param.item, config = param.config;
+    // 只在客戶端渲染 CKEditor
+    if (typeof window === "undefined") {
+        return /*#__PURE__*/ jsx$1("div", {
+            className: "p-4 border border-gray-200 rounded",
+            children: /*#__PURE__*/ jsx$1("p", {
+                className: "text-gray-500",
+                children: "Loading editor..."
+            })
+        });
+    }
+    return /*#__PURE__*/ jsx$1(BaseCkeditor$1, {
+        item: item,
+        config: config
+    });
+};
 var TextField = function(param) {
     var item = param.item;
     var _useFormContext = useFormContext(), register = _useFormContext.register, setValue = _useFormContext.setValue, errors = _useFormContext.formState.errors;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunggang/ui-lib",
-  "version": "0.4.32",
+  "version": "0.4.34",
   "sideEffects": [
     "*.css",
     "./src/style.css",

package/src/lib/Ckeditor/BaseCkeditor.d.ts

@@ -1,12 +1,14 @@
 /// <reference types="react" />
 import { FormItem } from '../Form/types';
+interface CkEditorConfig {
+    uploadUrl?: string;
+    fieldName?: string;
+    authToken?: string;
+    [key: string]: any;
+}
 interface CkEditorProps {
     item: FormItem;
-    config: {
-        uploadUrl?: string;
-        fieldName?: string;
-        authToken?: string;
-    };
+    config?: CkEditorConfig;
 }
 declare const BaseCkeditor: React.FC<CkEditorProps>;
 export default BaseCkeditor;

package/src/lib/Form/index.d.ts

@@ -1,5 +1,11 @@
 import type { FC } from 'react';
 import { FormItem, FormType } from './types';
+interface CkEditorConfig {
+    uploadUrl?: string;
+    fieldName?: string;
+    authToken?: string;
+    [key: string]: unknown;
+}
 export interface FormModule {
     Fields: FC<{
         formConfig: FormItem[][];
@@ -36,14 +42,14 @@ export interface FormModule {
     }>;
     BaseCkeditor: FC<{
         item: FormItem;
-        config: any;
+        config?: CkEditorConfig;
     }>;
     BaseSelect: FC<{
         item: FormItem;
     }>;
     Dropdown: FC<{
         item: FormItem;
-        onUtilsReady?: any;
+        onUtilsReady?: () => void;
     }>;
     FlatpickrField: FC<{
         item: FormItem;
@@ -62,3 +68,4 @@ export declare const Row: ({ rowItems }: {
     rowItems: any;
 }) => any;
 export declare const Form: FormModule;
+export {};