iglooform 3.2.0 → 3.2.1

package/es/config-provider.d.ts

@@ -1,9 +1,5 @@
 import { FC, ReactNode } from 'react';
-import { ConfigProvider as AntdConfigProvider } from 'antd';
 import { ConfigProviderProps } from 'antd/es/config-provider';
-export interface ConfigProviderContextType {
-    configProvider: typeof AntdConfigProvider;
-}
 export declare let staticAntdConfig: ConfigProviderProps;
 declare const ConfigProvider: FC<{
     currentLang: string;

package/es/config-provider.js

@@ -1,14 +1,7 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { useEffect } from 'react';
-import { ConfigProvider as AntdConfigProvider } from 'antd';
 import LocalProvider from "./locale/locale-provider";
 import { jsx as _jsx } from "react/jsx-runtime";
-export var staticAntdConfig;
+export var staticAntdConfig = {};
 var ConfigProvider = function ConfigProvider(_ref) {
   var currentLang = _ref.currentLang,
     _ref$config = _ref.config,
@@ -17,12 +10,10 @@ var ConfigProvider = function ConfigProvider(_ref) {
   useEffect(function () {
     staticAntdConfig = config;
   }, [config]);
-  return /*#__PURE__*/_jsx(AntdConfigProvider, _objectSpread(_objectSpread({}, config), {}, {
-    children: /*#__PURE__*/_jsx(LocalProvider, {
-      currentLang: currentLang,
-      underConfigProvider: true,
-      children: children
-    })
-  }));
+  return /*#__PURE__*/_jsx(LocalProvider, {
+    currentLang: currentLang,
+    antdConfig: config,
+    children: children
+  });
 };
 export default ConfigProvider;

package/es/locale/locale-provider.d.ts

@@ -7,7 +7,6 @@ export declare const locales: {
 };
 declare const LocaleProvider: FC<{
     currentLang: string;
-    underConfigProvider?: boolean;
     antdConfig?: ConfigProviderProps;
     children?: ReactNode;
 }>;

package/es/locale/locale-provider.js

@@ -45,8 +45,8 @@ var antdLocale = {
 var LocaleProvider = function LocaleProvider(_ref) {
   var children = _ref.children,
     currentLang = _ref.currentLang,
-    underConfigProvider = _ref.underConfigProvider,
-    antdConfig = _ref.antdConfig;
+    _ref$antdConfig = _ref.antdConfig,
+    antdConfig = _ref$antdConfig === void 0 ? {} : _ref$antdConfig;
   var locale = locales[currentLang] || en;
   useEffect(function () {
     staticLang.current = currentLang;
@@ -66,7 +66,7 @@ var LocaleProvider = function LocaleProvider(_ref) {
       formatMessage: formatMessage,
       currentLang: currentLang
     },
-    children: underConfigProvider ? children : /*#__PURE__*/_jsx(ConfigProvider, _objectSpread(_objectSpread({}, antdConfig), {}, {
+    children: /*#__PURE__*/_jsx(ConfigProvider, _objectSpread(_objectSpread({}, antdConfig), {}, {
       locale: antdLocale[currentLang] || antdDefault,
       children: children
     }))

package/lib/config-provider.d.ts

@@ -1,9 +1,5 @@
 import { FC, ReactNode } from 'react';
-import { ConfigProvider as AntdConfigProvider } from 'antd';
 import { ConfigProviderProps } from 'antd/es/config-provider';
-export interface ConfigProviderContextType {
-    configProvider: typeof AntdConfigProvider;
-}
 export declare let staticAntdConfig: ConfigProviderProps;
 declare const ConfigProvider: FC<{
     currentLang: string;

package/lib/config-provider.js

@@ -5,17 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.staticAntdConfig = exports.default = void 0;
 var _react = require("react");
-var _antd = require("antd");
 var _localeProvider = _interopRequireDefault(require("./locale/locale-provider"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var staticAntdConfig;
+var staticAntdConfig = {};
 exports.staticAntdConfig = staticAntdConfig;
 var ConfigProvider = function ConfigProvider(_ref) {
   var currentLang = _ref.currentLang,
@@ -25,13 +18,11 @@ var ConfigProvider = function ConfigProvider(_ref) {
   (0, _react.useEffect)(function () {
     exports.staticAntdConfig = staticAntdConfig = config;
   }, [config]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, _objectSpread(_objectSpread({}, config), {}, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_localeProvider.default, {
-      currentLang: currentLang,
-      underConfigProvider: true,
-      children: children
-    })
-  }));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_localeProvider.default, {
+    currentLang: currentLang,
+    antdConfig: config,
+    children: children
+  });
 };
 var _default = ConfigProvider;
 exports.default = _default;

package/lib/locale/locale-provider.d.ts

@@ -7,7 +7,6 @@ export declare const locales: {
 };
 declare const LocaleProvider: FC<{
     currentLang: string;
-    underConfigProvider?: boolean;
     antdConfig?: ConfigProviderProps;
     children?: ReactNode;
 }>;

package/lib/locale/locale-provider.js

@@ -52,8 +52,8 @@ var antdLocale = {
 var LocaleProvider = function LocaleProvider(_ref) {
   var children = _ref.children,
     currentLang = _ref.currentLang,
-    underConfigProvider = _ref.underConfigProvider,
-    antdConfig = _ref.antdConfig;
+    _ref$antdConfig = _ref.antdConfig,
+    antdConfig = _ref$antdConfig === void 0 ? {} : _ref$antdConfig;
   var locale = locales[currentLang] || _enUS.default;
   (0, _react.useEffect)(function () {
     _formatMessage.staticLang.current = currentLang;
@@ -73,7 +73,7 @@ var LocaleProvider = function LocaleProvider(_ref) {
       formatMessage: formatMessage,
       currentLang: currentLang
     },
-    children: underConfigProvider ? children : /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, _objectSpread(_objectSpread({}, antdConfig), {}, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, _objectSpread(_objectSpread({}, antdConfig), {}, {
       locale: antdLocale[currentLang] || _en_US.default,
       children: children
     }))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",