@faasjs/ant-design 3.3.0 → 3.5.0

package/README.md

@@ -52,6 +52,7 @@ type FaasItemProps = {
 - [Title](functions/Title.md)
 - [transferOptions](functions/transferOptions.md)
 - [transferValue](functions/transferValue.md)
+- [upperFirst](functions/upperFirst.md)
 - [useApp](functions/useApp.md)
 - [useConfigContext](functions/useConfigContext.md)
 - [useDrawer](functions/useDrawer.md)

package/dist/index.d.mts

@@ -201,7 +201,7 @@ interface useAppProps {
  */
 declare function App(props: AppProps): react_jsx_runtime.JSX.Element;
 declare namespace App {
-    var useApp: () => Readonly<useAppProps>;
+    var useApp: <NewT extends useAppProps = useAppProps>() => Readonly<useAppProps | NewT>;
     var whyDidYouRender: boolean;
 }
 /**
@@ -213,7 +213,7 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare const useApp: () => Readonly<useAppProps>;
+declare const useApp: <NewT extends useAppProps = useAppProps>() => Readonly<useAppProps | NewT>;
 
 interface BlankProps {
     value?: any;
@@ -519,6 +519,7 @@ interface FaasItemProps extends BaseItemProps {
      */
     type?: FaasItemType;
 }
+declare function upperFirst(str: string): string;
 /**
  * convert string[] or number[] to { label, value }[]
  */
@@ -746,4 +747,4 @@ declare namespace Title {
     var whyDidYouRender: boolean;
 }
 
-export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };
+export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, upperFirst, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };

package/dist/index.d.ts

@@ -201,7 +201,7 @@ interface useAppProps {
  */
 declare function App(props: AppProps): react_jsx_runtime.JSX.Element;
 declare namespace App {
-    var useApp: () => Readonly<useAppProps>;
+    var useApp: <NewT extends useAppProps = useAppProps>() => Readonly<useAppProps | NewT>;
     var whyDidYouRender: boolean;
 }
 /**
@@ -213,7 +213,7 @@ declare namespace App {
  * const { message, notification, setModalProps, setDrawerProps } = useApp()
  * ```
  */
-declare const useApp: () => Readonly<useAppProps>;
+declare const useApp: <NewT extends useAppProps = useAppProps>() => Readonly<useAppProps | NewT>;
 
 interface BlankProps {
     value?: any;
@@ -519,6 +519,7 @@ interface FaasItemProps extends BaseItemProps {
      */
     type?: FaasItemType;
 }
+declare function upperFirst(str: string): string;
 /**
  * convert string[] or number[] to { label, value }[]
  */
@@ -746,4 +747,4 @@ declare namespace Title {
     var whyDidYouRender: boolean;
 }
 
-export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };
+export { App, type AppProps, type BaseItemProps, type BaseOption, Blank, type BlankProps, ConfigContext, ConfigProvider, type ConfigProviderProps, Description, type DescriptionItemContentProps, type DescriptionItemProps, type DescriptionProps, Drawer, type DrawerProps, ErrorBoundary, type ExtendDescriptionItemProps, type ExtendDescriptionTypeProps, type ExtendFormItemProps, type ExtendFormTypeProps, type ExtendTableItemProps, type ExtendTableTypeProps, type ExtendTypes, type FaasDataInjection, FaasDataWrapper, type FaasDataWrapperProps, type FaasItemProps, type FaasItemType, type FaasItemTypeValue, Form, FormItem, type FormItemProps, type FormProps, type FormSubmitProps, Link, type LinkProps, Loading, type LoadingProps, Modal, type ModalProps, PageNotFound, Routes, type RoutesProps, type TabProps, Table, type TableItemProps, type TableProps, Tabs, type TabsProps, Title, type TitleProps, type UnionFaasItemElement, type UnionFaasItemInjection, type UnionFaasItemProps, type UnionFaasItemRender, type UnionScene, type setDrawerProps, type setModalProps, transferOptions, transferValue, upperFirst, useApp, type useAppProps, useConfigContext, useDrawer, useModal, withFaasData };

package/dist/index.js

@@ -169,7 +169,7 @@ var AppContext = react.createSplittingContext({
 function RoutesApp(props) {
   const location = reactRouterDom.useLocation();
   const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
-  react$1.useEffect(() => {
+  react.useEqualEffect(() => {
     console.debug("location", location);
     if (drawerProps.open) setDrawerProps({ open: false });
     if (modalProps.open) setModalProps({ open: false });
@@ -181,7 +181,7 @@ function App(props) {
   const [notificationApi, notificationContextHolder] = antd.notification.useNotification();
   const { modal, modalProps, setModalProps } = useModal();
   const { drawer, drawerProps, setDrawerProps } = useDrawer();
-  const styleProviderProps = react$1.useMemo(
+  const styleProviderProps = react.useEqualMemo(
     () => ({
       ...props.styleProviderProps,
       hashPriority: "high",
@@ -239,14 +239,17 @@ App.useApp = useApp;
 App.whyDidYouRender = true;
 function Blank(options) {
   const { theme } = useConfigContext();
-  return !options || lodashEs.isNil(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsxRuntime.jsx(antd.Typography.Text, { disabled: true, children: options?.text || theme.Blank.text }) : options.value;
+  return !options || options.value === void 0 || options.value === null || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsxRuntime.jsx(antd.Typography.Text, { disabled: true, children: options?.text || theme.Blank.text }) : options.value;
 }
 Blank.whyDidYouRender = true;
+function upperFirst(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
 function transferOptions(options) {
   if (!options) return [];
   return options.map(
     (item) => typeof item === "object" ? item : {
-      label: lodashEs.upperFirst(item.toString()),
+      label: upperFirst(item.toString()),
       value: item
     }
   );
@@ -317,7 +320,7 @@ function DescriptionItemContent(props) {
   react$1.useEffect(() => {
     const propsCopy = { ...props };
     if (!propsCopy.item.title)
-      propsCopy.item.title = lodashEs.upperFirst(propsCopy.item.id);
+      propsCopy.item.title = upperFirst(propsCopy.item.id);
     if (!propsCopy.item.type) propsCopy.item.type = "string";
     if (propsCopy.item.options?.length) {
       propsCopy.item.options = transferOptions(propsCopy.item.options);
@@ -454,11 +457,11 @@ function Description(props) {
     antd.Descriptions,
     {
       ...props,
-      title: lodashEs.isFunction(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
+      title: typeof props.renderTitle === "function" ? props.renderTitle(props.dataSource) : props.title,
       items: props.items.filter((item) => item && (!item.if || item.if(props.dataSource))).map((item) => ({
         ...item,
         key: item.id,
-        label: item.title || lodashEs.upperFirst(item.id),
+        label: item.title || upperFirst(item.id),
         children: /* @__PURE__ */ jsxRuntime.jsx(
           DescriptionItemContent,
           {
@@ -477,7 +480,7 @@ function isOptionsProps(item) {
   return item && Array.isArray(item.options);
 }
 function processProps(propsCopy, config) {
-  if (!propsCopy.title) propsCopy.title = lodashEs.upperFirst(propsCopy.id);
+  if (!propsCopy.title) propsCopy.title = upperFirst(propsCopy.id);
   if (!propsCopy.label && propsCopy.label !== false)
     propsCopy.label = propsCopy.title;
   if (!propsCopy.name) propsCopy.name = propsCopy.id;
@@ -1023,7 +1026,7 @@ function Table(props) {
     for (const item of items) {
       if (!item.key) item.key = item.id;
       if (!item.dataIndex) item.dataIndex = item.id;
-      if (!item.title) item.title = lodashEs.upperFirst(item.id);
+      if (!item.title) item.title = upperFirst(item.id);
       if (!item.type) item.type = "string";
       if (item.options?.length) {
         item.options = transferOptions(item.options);
@@ -1578,6 +1581,7 @@ exports.Tabs = Tabs;
 exports.Title = Title;
 exports.transferOptions = transferOptions;
 exports.transferValue = transferValue;
+exports.upperFirst = upperFirst;
 exports.useApp = useApp;
 exports.useConfigContext = useConfigContext;
 exports.useDrawer = useDrawer;

package/dist/index.mjs

@@ -1,12 +1,12 @@
-import { createSplittingContext, useEqualCallback, ErrorBoundary as ErrorBoundary$1, useEqualEffect, FaasReactClient, OptionalWrapper, FaasDataWrapper as FaasDataWrapper$1, withFaasData as withFaasData$1, faas } from '@faasjs/react';
+import { createSplittingContext, useEqualCallback, ErrorBoundary as ErrorBoundary$1, useEqualEffect, FaasReactClient, useEqualMemo, OptionalWrapper, FaasDataWrapper as FaasDataWrapper$1, withFaasData as withFaasData$1, faas } from '@faasjs/react';
 export { faas, useFaas } from '@faasjs/react';
 import { Form as Form$1, Modal as Modal$1, Drawer as Drawer$1, message, notification, ConfigProvider as ConfigProvider$1, Typography, Spin, Descriptions, Input, Button, Row, Col, DatePicker, Switch, Select, InputNumber, Radio, Result, Skeleton, Table as Table$1, Tabs as Tabs$1, Alert, Space } from 'antd';
 import { legacyLogicalPropertiesTransformer, StyleProvider } from '@ant-design/cssinjs';
-import { createContext, useState, useContext, useMemo, useEffect, cloneElement, Suspense } from 'react';
+import { createContext, useState, useContext, useEffect, cloneElement, Suspense } from 'react';
 export { lazy } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { BrowserRouter, useNavigate, Routes as Routes$1, Route, useLocation } from 'react-router-dom';
-import { defaultsDeep, isNil, upperFirst, isFunction, cloneDeep, uniqBy } from 'lodash-es';
+import { defaultsDeep, cloneDeep, isNil, uniqBy } from 'lodash-es';
 import dayjs2 from 'dayjs';
 import { PlusOutlined, MinusCircleOutlined, CheckOutlined, CloseOutlined } from '@ant-design/icons';
 
@@ -165,7 +165,7 @@ var AppContext = createSplittingContext({
 function RoutesApp(props) {
   const location = useLocation();
   const { drawerProps, setDrawerProps, modalProps, setModalProps } = useApp();
-  useEffect(() => {
+  useEqualEffect(() => {
     console.debug("location", location);
     if (drawerProps.open) setDrawerProps({ open: false });
     if (modalProps.open) setModalProps({ open: false });
@@ -177,7 +177,7 @@ function App(props) {
   const [notificationApi, notificationContextHolder] = notification.useNotification();
   const { modal, modalProps, setModalProps } = useModal();
   const { drawer, drawerProps, setDrawerProps } = useDrawer();
-  const styleProviderProps = useMemo(
+  const styleProviderProps = useEqualMemo(
     () => ({
       ...props.styleProviderProps,
       hashPriority: "high",
@@ -235,9 +235,12 @@ App.useApp = useApp;
 App.whyDidYouRender = true;
 function Blank(options) {
   const { theme } = useConfigContext();
-  return !options || isNil(options.value) || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsx(Typography.Text, { disabled: true, children: options?.text || theme.Blank.text }) : options.value;
+  return !options || options.value === void 0 || options.value === null || Array.isArray(options.value) && !options.value.length || options.value === "" ? /* @__PURE__ */ jsx(Typography.Text, { disabled: true, children: options?.text || theme.Blank.text }) : options.value;
 }
 Blank.whyDidYouRender = true;
+function upperFirst(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
 function transferOptions(options) {
   if (!options) return [];
   return options.map(
@@ -450,7 +453,7 @@ function Description(props) {
     Descriptions,
     {
       ...props,
-      title: isFunction(props.renderTitle) ? props.renderTitle(props.dataSource) : props.title,
+      title: typeof props.renderTitle === "function" ? props.renderTitle(props.dataSource) : props.title,
       items: props.items.filter((item) => item && (!item.if || item.if(props.dataSource))).map((item) => ({
         ...item,
         key: item.id,
@@ -1542,4 +1545,4 @@ function Title(props) {
 }
 Title.whyDidYouRender = true;
 
-export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, transferOptions, transferValue, useApp, useConfigContext, useDrawer, useModal, withFaasData };
+export { App, Blank, ConfigContext, ConfigProvider, Description, Drawer, ErrorBoundary, FaasDataWrapper, Form, FormItem, Link, Loading, Modal, PageNotFound, Routes, Table, Tabs, Title, transferOptions, transferValue, upperFirst, useApp, useConfigContext, useDrawer, useModal, withFaasData };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/ant-design",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -34,7 +34,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@faasjs/react": "3.3.0",
+    "@faasjs/react": "3.5.0",
     "antd": "*",
     "@ant-design/icons": "*",
     "lodash-es": "*",
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "*",
-    "@faasjs/react": "3.3.0",
+    "@faasjs/react": "3.5.0",
     "antd": "*",
     "@ant-design/icons": "*",
     "lodash-es": "*",