@pinnacle0/web-ui 0.6.46 → 0.7.0-beta.2

package/core/Form/Item.js

@@ -2,45 +2,33 @@ import React from "react";
 import { classNames } from "../../util/ClassNames";
 import { Tooltip } from "../Tooltip";
 import { FormValidationContext } from "./context";
-export class Item extends React.PureComponent {
-    static displayName = "Form.Item";
-    static contextType = FormValidationContext;
-    overlayStyle = { color: "red" };
-    constructor(props) {
-        super(props);
-        this.state = { errorMessage: null };
-    }
-    componentDidMount() {
-        this.context.registerValidator(this.validate);
-    }
-    componentWillUnmount() {
-        this.context.unregisterValidator(this.validate);
-    }
-    validate = async () => {
-        const { validator } = this.props;
-        if (validator) {
-            const errorMessage = await validator();
-            this.setState({ errorMessage });
-            return errorMessage === null;
-        }
-        else {
+import { ReactUtil } from "../../util/ReactUtil";
+const overlayStyle = { color: "red" };
+export const Item = ReactUtil.memo("Item", (props) => {
+    const { label, children, className, required, extra, labelStyle, widthMode, validator } = props;
+    const { registerValidator, unregisterValidator, errorDisplayMode } = React.useContext(FormValidationContext);
+    const [errorMessage, setErrorMessage] = React.useState(null);
+    const validate = React.useCallback(async () => {
+        if (!validator)
             return true;
-        }
-    };
-    render() {
-        const { label, children, className, required, extra, labelStyle, widthMode } = this.props;
-        const { errorMessage } = this.state;
-        const errorDisplayMode = this.context.errorDisplayMode();
-        const childrenNode = typeof children === "number" || typeof children === "string" ? React.createElement("span", { className: "pure-text" }, children) : children;
-        const extraMessageNode = extra && React.createElement("div", { className: "message" }, extra);
-        return (React.createElement("div", { className: classNames("g-form-item", className) },
-            React.createElement("div", { className: classNames("g-form-item-label", { required }), style: labelStyle }, label && React.createElement("label", null, label)),
-            React.createElement("div", { className: classNames("g-form-item-children", { "has-error": errorMessage }, widthMode ? `width-${widthMode}` : "") }, errorDisplayMode.type === "extra" ? (React.createElement(React.Fragment, null,
-                childrenNode,
-                extraMessageNode,
-                errorMessage && React.createElement("div", { className: "message error" }, errorMessage))) : (React.createElement(React.Fragment, null,
-                React.createElement(Tooltip, { title: errorMessage, open: errorMessage !== null, placement: errorDisplayMode.placement || "right", color: "white", styles: { body: this.overlayStyle } }, childrenNode),
-                extraMessageNode)))));
-    }
-}
+        const errorMessage = await validator();
+        setErrorMessage(errorMessage);
+        return errorMessage === null;
+    }, [validator]);
+    React.useEffect(() => {
+        registerValidator(validate);
+        return () => unregisterValidator(validate);
+    }, [registerValidator, unregisterValidator, validate]);
+    const childrenNode = typeof children === "number" || typeof children === "string" ? React.createElement("span", { className: "pure-text" }, children) : children;
+    const extraMessageNode = extra && React.createElement("div", { className: "message" }, extra);
+    const errorDisplay = errorDisplayMode();
+    return (React.createElement("div", { className: classNames("g-form-item", className) },
+        React.createElement("div", { className: classNames("g-form-item-label", { required }), style: labelStyle }, label && React.createElement("label", null, label)),
+        React.createElement("div", { className: classNames("g-form-item-children", { "has-error": errorMessage }, widthMode ? `width-${widthMode}` : "") }, errorDisplay.type === "extra" ? (React.createElement(React.Fragment, null,
+            childrenNode,
+            extraMessageNode,
+            errorMessage && React.createElement("div", { className: "message error" }, errorMessage))) : (React.createElement(React.Fragment, null,
+            React.createElement(Tooltip, { title: errorMessage, open: errorMessage !== null, placement: errorDisplay.placement || "right", color: "white", styles: { container: overlayStyle } }, childrenNode),
+            extraMessageNode)))));
+});
 //# sourceMappingURL=Item.js.map

package/core/Form/Item.js.map

@@ -1 +1 @@
-{"version":3,"file":"Item.js","sourceRoot":"","sources":["../../../src/core/Form/Item.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Item.js","sourceRoot":"","sources":["../../../src/core/Form/Item.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AACnC,OAAO,EAAC,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAe/C,MAAM,YAAY,GAAwB,EAAC,KAAK,EAAE,KAAK,EAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAY,EAAE,EAAE;IACxD,MAAM,EAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAC,GAAG,KAAK,CAAC;IAC9F,MAAM,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAC3G,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,IAAsB,EAAE;QAC5D,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAE5B,MAAM,YAAY,GAAG,MAAM,SAAS,EAAE,CAAC;QACvC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC9B,OAAO,YAAY,KAAK,IAAI,CAAC;IACjC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC5B,OAAO,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvD,MAAM,YAAY,GAAG,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,8BAAM,SAAS,EAAC,WAAW,IAAE,QAAQ,CAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC7I,MAAM,gBAAgB,GAAG,KAAK,IAAI,6BAAK,SAAS,EAAC,SAAS,IAAE,KAAK,CAAO,CAAC;IACzE,MAAM,YAAY,GAAG,gBAAgB,EAAE,CAAC;IAExC,OAAO,CACH,6BAAK,SAAS,EAAE,UAAU,CAAC,aAAa,EAAE,SAAS,CAAC;QAChD,6BAAK,SAAS,EAAE,UAAU,CAAC,mBAAmB,EAAE,EAAC,QAAQ,EAAC,CAAC,EAAE,KAAK,EAAE,UAAU,IACzE,KAAK,IAAI,mCAAQ,KAAK,CAAS,CAC9B;QACN,6BAAK,SAAS,EAAE,UAAU,CAAC,sBAAsB,EAAE,EAAC,WAAW,EAAE,YAAY,EAAC,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IACjH,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,CAC7B,oBAAC,KAAK,CAAC,QAAQ;YACV,YAAY;YACZ,gBAAgB;YAChB,YAAY,IAAI,6BAAK,SAAS,EAAC,eAAe,IAAE,YAAY,CAAO,CACvD,CACpB,CAAC,CAAC,CAAC,CACA,oBAAC,KAAK,CAAC,QAAQ;YACX,oBAAC,OAAO,IAAC,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,KAAK,IAAI,EAAE,SAAS,EAAE,YAAY,CAAC,SAAS,IAAI,OAAO,EAAE,KAAK,EAAC,OAAO,EAAC,MAAM,EAAE,EAAC,SAAS,EAAE,YAAY,EAAC,IACnJ,YAAY,CACP;YACT,gBAAgB,CACJ,CACpB,CACC,CACJ,CACT,CAAC;AACN,CAAC,CAAC,CAAC"}

package/core/Form/index.d.ts

@@ -1,9 +1,10 @@
 import React from "react";
-import { Item } from "./Item";
-import type { PickOptional } from "../../internal/type";
 import type { FormErrorDisplayMode } from "./context";
 import "./index.less";
 export type { Props as FormItemProps, FormValidator } from "./Item";
+export interface FormHandler {
+    triggerSubmit: () => Promise<boolean>;
+}
 export interface Props {
     children: React.ReactNode;
     id?: string;
@@ -20,18 +21,6 @@ export interface Props {
     buttonRenderer?: ((submitButton: React.ReactElement, isValidating: boolean, loading?: boolean) => React.ReactElement) | null;
     allowBrowserAutoComplete?: boolean;
 }
-interface State {
-    isValidating: boolean;
-}
-export declare class Form extends React.PureComponent<Props, State> {
-    static displayName: string;
-    static defaultProps: PickOptional<Props>;
-    static Item: typeof Item;
-    private readonly validationContext;
-    private validators;
-    constructor(props: Props);
-    triggerSubmit: () => Promise<boolean>;
-    onSubmit: (event: React.FormEvent) => Promise<void>;
-    renderSubmitButton(): React.JSX.Element | null;
-    render(): React.JSX.Element;
-}
+export declare const Form: React.ForwardRefExoticComponent<Props & React.RefAttributes<FormHandler>> & {
+    Item: (props: import("./Item").Props) => React.JSX.Element;
+};

package/core/Form/index.js

@@ -5,37 +5,30 @@ import { FormValidationContext } from "./context";
 import { i18n } from "../../internal/i18n/core";
 import { Item } from "./Item";
 import "./index.less";
-export class Form extends React.PureComponent {
-    static displayName = "Form";
-    static defaultProps = {
-        layout: "horizontal",
-        errorDisplayMode: { type: "extra" },
+import { ReactUtil } from "../../util/ReactUtil";
+export const Form = ReactUtil.compound("Form", { Item }, React.forwardRef((props, forwardRef) => {
+    const { children, id, className, style, layout = "horizontal", allowBrowserAutoComplete, loading, buttonRenderer: defaultButtonRenderer, buttonStyle, buttonText, buttonIcon, buttonDisabled, onFinish, errorDisplayMode = { type: "extra" }, } = props;
+    const [isValidating, setIsValidating] = React.useState(false);
+    const [validators, setValidators] = React.useState([]);
+    const registerValidator = React.useCallback((validator) => setValidators(prev => [...prev, validator]), []);
+    const unregisterValidator = React.useCallback((validator) => setValidators(prev => prev.filter(v => v !== validator)), []);
+    const validationContext = {
+        registerValidator,
+        unregisterValidator,
+        errorDisplayMode: () => errorDisplayMode,
     };
-    static Item = Item;
-    validationContext;
-    validators = [];
-    constructor(props) {
-        super(props);
-        this.state = {
-            isValidating: false,
-        };
-        this.validationContext = {
-            registerValidator: validator => this.validators.push(validator),
-            unregisterValidator: validator => {
-                const index = this.validators.indexOf(validator);
-                if (index >= 0) {
-                    this.validators.splice(index, 1);
-                }
-            },
-            errorDisplayMode: () => this.props.errorDisplayMode,
-        };
-    }
-    // Exposed for outer ref use, not recommended
-    triggerSubmit = async () => {
-        const { onFinish } = this.props;
+    React.useImperativeHandle(forwardRef, () => ({
+        triggerSubmit,
+    }));
+    const onSubmit = async (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        await triggerSubmit();
+    };
+    const triggerSubmit = async () => {
         try {
-            this.setState({ isValidating: true });
-            const validatorResults = await Promise.all(this.validators.map(_ => _()));
+            setIsValidating(true);
+            const validatorResults = await Promise.all(validators.map(_ => _()));
             if (validatorResults.every(_ => _)) {
                 // Also true even if validatorResults is []
                 onFinish?.();
@@ -44,27 +37,17 @@ export class Form extends React.PureComponent {
             return false;
         }
         finally {
-            this.setState({ isValidating: false });
+            setIsValidating(false);
         }
     };
-    onSubmit = async (event) => {
-        event.preventDefault();
-        event.stopPropagation();
-        await this.triggerSubmit();
-    };
-    renderSubmitButton() {
-        const { loading, buttonRenderer: defaultButtonRenderer, buttonStyle, buttonText, buttonIcon, buttonDisabled } = this.props;
-        const { isValidating } = this.state;
+    const renderSubmitButton = () => {
         const buttonRenderer = defaultButtonRenderer === undefined ? (submitButton) => submitButton : defaultButtonRenderer;
         const t = i18n();
         const submitButton = (React.createElement(Button, { className: "g-form-submit-button", htmlType: "submit", type: "primary", key: "submitButton", style: buttonStyle, loading: isValidating || loading, icon: buttonIcon, disabled: buttonDisabled || isValidating || loading }, buttonText || t.submit));
         return buttonRenderer !== null ? React.createElement(Form.Item, { className: "g-form-submit-form-item" }, buttonRenderer(submitButton, isValidating, loading)) : null;
-    }
-    render() {
-        const { children, id, className, style, layout, allowBrowserAutoComplete } = this.props;
-        return (React.createElement("form", { autoComplete: allowBrowserAutoComplete ? undefined : "off", id: id, className: classNames("g-form", `g-form-${layout}`, className), style: style, onSubmit: this.onSubmit },
-            React.createElement(FormValidationContext.Provider, { value: this.validationContext }, children),
-            this.renderSubmitButton()));
-    }
-}
+    };
+    return (React.createElement("form", { autoComplete: allowBrowserAutoComplete ? undefined : "off", id: id, className: classNames("g-form", `g-form-${layout}`, className), style: style, onSubmit: onSubmit },
+        React.createElement(FormValidationContext.Provider, { value: validationContext }, children),
+        renderSubmitButton()));
+}));
 //# sourceMappingURL=index.js.map

package/core/Form/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Form/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Form/index.tsx"],"names":[],"mappings":"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"}

package/core/Form/index.less

@@ -97,7 +97,7 @@
             &.has-error {
                 textarea,
                 input,
-                .ant-select-selector,
+                .ant-select-content,
                 .ant-descriptions-view,
                 .ant-input-affix-wrapper,
                 .ant-upload {

package/core/Grid/index.d.ts

@@ -1,4 +1,4 @@
-export declare const Grid: Readonly<{
+export declare const Grid: {
     Row: import("react").ForwardRefExoticComponent<import("antd").RowProps & import("react").RefAttributes<HTMLDivElement>>;
     Column: import("react").ForwardRefExoticComponent<import("antd").ColProps & import("react").RefAttributes<HTMLDivElement>>;
-}>;
+};

package/core/Grid/index.js

@@ -1,5 +1,6 @@
 import { Row, Col } from "antd";
-export const Grid = Object.freeze({
+import { ReactUtil } from "../../util/ReactUtil";
+export const Grid = ReactUtil.statics("Grid", {
     Row,
     Column: Col,
 });

package/core/Grid/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Grid/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AAE9B,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9B,GAAG;IACH,MAAM,EAAE,GAAG;CACd,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Grid/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE;IAC1C,GAAG;IACH,MAAM,EAAE,GAAG;CACd,CAAC,CAAC"}

package/core/HTMLContent/index.d.ts

@@ -4,8 +4,5 @@ interface Props {
     html: string;
     className?: string;
 }
-export declare class HTMLContent extends React.PureComponent<Props> {
-    static displayName: string;
-    render(): React.JSX.Element;
-}
+export declare const HTMLContent: ({ html, className }: Props) => React.JSX.Element;
 export {};

package/core/HTMLContent/index.js

@@ -1,11 +1,8 @@
 import React from "react";
 import { classNames } from "../../util/ClassNames";
+import { ReactUtil } from "../../util/ReactUtil";
 import "./index.less";
-export class HTMLContent extends React.PureComponent {
-    static displayName = "HTMLContent";
-    render() {
-        const { html, className } = this.props;
-        return React.createElement("div", { className: classNames("g-html-content", className), dangerouslySetInnerHTML: { __html: html } });
-    }
-}
+export const HTMLContent = ReactUtil.memo("HTMLContent", ({ html, className }) => {
+    return React.createElement("div", { className: classNames("g-html-content", className), dangerouslySetInnerHTML: { __html: html } });
+});
 //# sourceMappingURL=index.js.map

package/core/HTMLContent/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/HTMLContent/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,cAAc,CAAC;AAOtB,MAAM,OAAO,WAAY,SAAQ,KAAK,CAAC,aAAoB;IACvD,MAAM,CAAC,WAAW,GAAG,aAAa,CAAC;IAEnC,MAAM;QACF,MAAM,EAAC,IAAI,EAAE,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrC,OAAO,6BAAK,SAAS,EAAE,UAAU,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,GAAI,CAAC;IAChH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/HTMLContent/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,cAAc,CAAC;AAOtB,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,EAAC,IAAI,EAAE,SAAS,EAAQ,EAAE,EAAE;IAClF,OAAO,6BAAK,SAAS,EAAE,UAAU,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAAE,uBAAuB,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,GAAI,CAAC;AAChH,CAAC,CAAC,CAAC"}

package/core/Image/index.d.ts

@@ -1,10 +1,7 @@
 import type { ImageProps } from "antd/es/image";
-import AntImage from "antd/es/image";
 import React from "react";
 export interface Props extends ImageProps {
 }
-export declare class Image extends React.PureComponent<Props> {
-    static displayName: string;
-    static PreviewGroup: typeof AntImage.PreviewGroup;
-    render(): React.JSX.Element;
-}
+export declare const Image: ((props: Props) => React.JSX.Element) & {
+    PreviewGroup: React.FC<import("antd/es/image/PreviewGroup").PreviewGroupProps>;
+};

package/core/Image/index.js

@@ -1,10 +1,9 @@
 import AntImage from "antd/es/image";
 import React from "react";
-export class Image extends React.PureComponent {
-    static displayName = "Image";
-    static PreviewGroup = AntImage.PreviewGroup;
-    render() {
-        return React.createElement(AntImage, { ...this.props });
-    }
-}
+import { ReactUtil } from "../../util/ReactUtil";
+export const Image = ReactUtil.compound("Image", {
+    PreviewGroup: AntImage.PreviewGroup,
+}, (props) => {
+    return React.createElement(AntImage, { ...props });
+});
 //# sourceMappingURL=index.js.map

package/core/Image/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Image/index.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,OAAO,KAAM,SAAQ,KAAK,CAAC,aAAoB;IACjD,MAAM,CAAC,WAAW,GAAG,OAAO,CAAC;IAE7B,MAAM,CAAC,YAAY,GAAiC,QAAQ,CAAC,YAAY,CAAC;IAE1E,MAAM;QACF,OAAO,oBAAC,QAAQ,OAAK,IAAI,CAAC,KAAK,GAAI,CAAC;IACxC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Image/index.tsx"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,CAAC,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CACnC,OAAO,EACP;IACI,YAAY,EAAE,QAAQ,CAAC,YAAY;CACtC,EACD,CAAC,KAAY,EAAE,EAAE;IACb,OAAO,oBAAC,QAAQ,OAAK,KAAK,GAAI,CAAC;AACnC,CAAC,CACJ,CAAC"}

package/core/ImageUploader/index.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { UploaderProps, UploadSuccessLogEntry } from "../../util/UploadUtil/type";
+import type { UploaderProps } from "../../util/UploadUtil/type";
 import "./index.less";
 export interface Props<SuccessResponseType, ErrorResponseType> extends UploaderProps<SuccessResponseType, ErrorResponseType> {
     imageURL: string | null;
@@ -12,13 +12,4 @@ export interface Props<SuccessResponseType, ErrorResponseType> extends UploaderP
     className?: string;
     style?: React.CSSProperties;
 }
-export declare class ImageUploader<SuccessResponseType, ErrorResponseType> extends React.PureComponent<Props<SuccessResponseType, ErrorResponseType>> {
-    static displayName: string;
-    openPreviewModal: (e: React.MouseEvent) => Promise<void>;
-    removeImage: (e: React.MouseEvent) => Promise<void>;
-    beforeUpload: (file: File) => boolean;
-    preventUploadBehavior: (e: React.MouseEvent) => void;
-    onUploadSuccess: (logEntry: UploadSuccessLogEntry, response: SuccessResponseType) => void;
-    renderActionIcon: (name: string, icon: React.ReactElement) => React.JSX.Element;
-    render(): React.JSX.Element;
-}
+export declare const ImageUploader: <Res, Err>(props: Props<Res, Err>) => React.JSX.Element;

package/core/ImageUploader/index.js

@@ -8,53 +8,45 @@ import { MediaUtil } from "../../util/MediaUtil";
 import { i18n } from "../../internal/i18n/core";
 import { Uploader } from "../../core/Uploader";
 import { Tooltip } from "../../core/Tooltip";
+import { ReactUtil } from "../../util/ReactUtil";
 import "./index.less";
-export class ImageUploader extends React.PureComponent {
-    static displayName = "ImageUploader";
-    openPreviewModal = async (e) => {
+export const ImageUploader = ReactUtil.memo("ImageUploader", (props) => {
+    const { uploadURL, formField, className, style, imageURL, disabled, width, height, onRemove, onUploadFailure, fileSizeLimitMB, onChange, onUploadSuccess } = props;
+    const t = i18n();
+    const openPreviewModal = async (e) => {
         e.stopPropagation();
-        const { imageURL } = this.props;
-        if (imageURL) {
+        if (imageURL)
             await MediaUtil.openImage(imageURL);
-        }
     };
-    removeImage = async (e) => {
+    const removeImage = async (e) => {
         e.stopPropagation();
-        const { onRemove } = this.props;
-        const t = i18n();
         if (await ModalUtil.confirm(t.confirmImageRemoval)) {
             onRemove?.();
         }
     };
-    beforeUpload = (file) => {
-        const { fileSizeLimitMB } = this.props;
+    const beforeUpload = (file) => {
         if (fileSizeLimitMB && file.size > 1024 * 1024 * fileSizeLimitMB) {
             return false;
         }
         return true;
     };
-    preventUploadBehavior = (e) => {
+    const preventUploadBehavior = (e) => {
         if (e.target === e.currentTarget) {
             // Only trigger for clicking "Upload" icon
             e.stopPropagation();
         }
     };
-    onUploadSuccess = (logEntry, response) => {
-        const { onChange, onUploadSuccess } = this.props;
+    const onAntUploadSuccess = (logEntry, response) => {
         onChange(response);
         onUploadSuccess?.(logEntry, response);
     };
-    renderActionIcon = (name, icon) => {
+    const renderActionIcon = (name, icon) => {
         return (React.createElement(Tooltip, { title: name, childContainerProps: { className: "action" } }, icon));
     };
-    render() {
-        const { uploadURL, formField, className, style, imageURL, disabled, width, height, onRemove, onUploadFailure } = this.props;
-        const t = i18n();
-        return (React.createElement(Uploader, { accept: "image/*", formField: formField, uploadURL: uploadURL, onUploadFailure: onUploadFailure, onUploadSuccess: this.onUploadSuccess, style: { ...style, width, height }, className: classNames("g-image-uploader", className), disabled: disabled, beforeUpload: this.beforeUpload }, imageURL ? (React.createElement("div", { className: "image-container", style: { backgroundImage: `url(${imageURL})`, height } },
-            React.createElement("div", { className: "overlay", onClick: this.preventUploadBehavior },
-                this.renderActionIcon(t.preview, React.createElement(EyeOutlined, { onClick: this.openPreviewModal })),
-                !disabled && this.renderActionIcon(t.upload, React.createElement(CloudUploadOutlined, null)),
-                !disabled && onRemove && this.renderActionIcon(t.delete, React.createElement(DeleteOutlined, { onClick: this.removeImage }))))) : (t.uploadHint)));
-    }
-}
+    return (React.createElement(Uploader, { accept: "image/*", formField: formField, uploadURL: uploadURL, onUploadFailure: onUploadFailure, onUploadSuccess: onAntUploadSuccess, style: { ...style, width, height }, className: classNames("g-image-uploader", className), disabled: disabled, beforeUpload: beforeUpload }, imageURL ? (React.createElement("div", { className: "image-container", style: { backgroundImage: `url(${imageURL})`, height } },
+        React.createElement("div", { className: "overlay", onClick: preventUploadBehavior },
+            renderActionIcon(t.preview, React.createElement(EyeOutlined, { onClick: openPreviewModal })),
+            !disabled && renderActionIcon(t.upload, React.createElement(CloudUploadOutlined, null)),
+            !disabled && onRemove && renderActionIcon(t.delete, React.createElement(DeleteOutlined, { onClick: removeImage }))))) : (t.uploadHint)));
+});
 //# sourceMappingURL=index.js.map

package/core/ImageUploader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/ImageUploader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,cAAc,MAAM,kCAAkC,CAAC;AAC9D,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,IAAI,EAAC,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAC,OAAO,EAAC,MAAM,oBAAoB,CAAC;AAC3C,OAAO,cAAc,CAAC;AActB,MAAM,OAAO,aAAsD,SAAQ,KAAK,CAAC,aAA4D;IACzI,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC;IAErC,gBAAgB,GAAG,KAAK,EAAE,CAAmB,EAAE,EAAE;QAC7C,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,QAAQ,EAAE,CAAC;YACX,MAAM,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC;IACL,CAAC,CAAC;IAEF,WAAW,GAAG,KAAK,EAAE,CAAmB,EAAE,EAAE;QACxC,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;QACjB,IAAI,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACjD,QAAQ,EAAE,EAAE,CAAC;QACjB,CAAC;IACL,CAAC,CAAC;IAEF,YAAY,GAAG,CAAC,IAAU,EAAW,EAAE;QACnC,MAAM,EAAC,eAAe,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACrC,IAAI,eAAe,IAAI,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,eAAe,EAAE,CAAC;YAC/D,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC;IAEF,qBAAqB,GAAG,CAAC,CAAmB,EAAE,EAAE;QAC5C,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;YAC/B,0CAA0C;YAC1C,CAAC,CAAC,eAAe,EAAE,CAAC;QACxB,CAAC;IACL,CAAC,CAAC;IAEF,eAAe,GAAG,CAAC,QAA+B,EAAE,QAA6B,EAAE,EAAE;QACjF,MAAM,EAAC,QAAQ,EAAE,eAAe,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/C,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnB,eAAe,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,gBAAgB,GAAG,CAAC,IAAY,EAAE,IAAwB,EAAE,EAAE;QAC1D,OAAO,CACH,oBAAC,OAAO,IAAC,KAAK,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,IAC3D,IAAI,CACC,CACb,CAAC;IACN,CAAC,CAAC;IAEF,MAAM;QACF,MAAM,EAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1H,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;QACjB,OAAO,CACH,oBAAC,QAAQ,IACL,MAAM,EAAC,SAAS,EAChB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,eAAe,EAChC,eAAe,EAAE,IAAI,CAAC,eAAe,EACrC,KAAK,EAAE,EAAC,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,EAAC,EAChC,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE,SAAS,CAAC,EACpD,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,IAAI,CAAC,YAAY,IAE9B,QAAQ,CAAC,CAAC,CAAC,CACR,6BAAK,SAAS,EAAC,iBAAiB,EAAC,KAAK,EAAE,EAAC,eAAe,EAAE,OAAO,QAAQ,GAAG,EAAE,MAAM,EAAC;YACjF,6BAAK,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB;gBACvD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,oBAAC,WAAW,IAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,GAAI,CAAC;gBACjF,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,oBAAC,mBAAmB,OAAG,CAAC;gBACrE,CAAC,QAAQ,IAAI,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,EAAE,oBAAC,cAAc,IAAC,OAAO,EAAE,IAAI,CAAC,WAAW,GAAI,CAAC,CACtG,CACJ,CACT,CAAC,CAAC,CAAC,CACA,CAAC,CAAC,UAAU,CACf,CACM,CACd,CAAC;IACN,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/ImageUploader/index.tsx"],"names":[],"mappings":"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"}

package/core/Input/index.d.ts

@@ -22,22 +22,16 @@ export interface Props extends Omit<InputProps, ExcludedAntInputKeys>, Controlle
     focus?: FocusType;
     inputRef?: React.RefObject<InputRef | null>;
 }
-export declare class Input extends React.PureComponent<Props> {
-    static displayName: string;
-    static Readonly: (props: InputReadonlyProps) => React.JSX.Element;
-    static Search: ({ onChange, ...rest }: InputSearchProps) => React.JSX.Element;
-    static TextArea: ({ onChange, ...rest }: InputTextAreaProps) => React.JSX.Element;
-    static Password: ({ onChange, ...rest }: InputPasswordProps) => React.JSX.Element;
-    static Nullable: ({ value, onChange, ...rest }: InputNullableProps) => React.JSX.Element;
-    static NullableTextArea: ({ value, onChange, ...rest }: InputNullableTextAreaProps) => React.JSX.Element;
-    private static onChange;
-    private antInputRef;
-    private getRef;
-    private createFocusOptions;
-    private handleClick;
-    componentDidMount(): void;
-    blur: () => void | undefined;
-    focus: (focusType?: FocusType) => void | undefined;
-    render(): React.JSX.Element;
-}
+export interface InputHandler {
+    blur: () => void;
+    focus: (focusType?: FocusType) => void;
+}
+export declare const Input: React.ForwardRefExoticComponent<Props & React.RefAttributes<InputHandler>> & {
+    Readonly: (props: InputReadonlyProps) => React.JSX.Element;
+    Search: ({ onChange, ...rest }: InputSearchProps) => React.JSX.Element;
+    TextArea: ({ onChange, ...rest }: InputTextAreaProps) => React.JSX.Element;
+    Password: ({ onChange, ...rest }: InputPasswordProps) => React.JSX.Element;
+    Nullable: ({ value, onChange, ...rest }: InputNullableProps) => React.JSX.Element;
+    NullableTextArea: ({ value, onChange, ...rest }: InputNullableTextAreaProps) => React.JSX.Element;
+};
 export {};

package/core/Input/index.js

@@ -1,50 +1,46 @@
 import React from "react";
 import AntInput from "antd/es/input";
-export class Input extends React.PureComponent {
-    static displayName = "Input";
-    static Readonly = (props) => React.createElement(AntInput, { onChange: () => { }, readOnly: true, disabled: true, ...props });
-    static Search = ({ onChange, ...rest }) => React.createElement(AntInput.Search, { onChange: e => Input.onChange(e, onChange), ...rest });
-    static TextArea = ({ onChange, ...rest }) => React.createElement(AntInput.TextArea, { onChange: e => Input.onChange(e, onChange), ...rest });
-    static Password = ({ onChange, ...rest }) => React.createElement(AntInput.Password, { onChange: e => Input.onChange(e, onChange), ...rest });
-    static Nullable = ({ value, onChange, ...rest }) => React.createElement(Input, { value: value || "", onChange: value => onChange(value.trim() ? value : null), ...rest });
-    static NullableTextArea = ({ value, onChange, ...rest }) => React.createElement(Input.TextArea, { value: value || "", onChange: value => onChange(value.trim() ? value : null), ...rest });
-    static onChange = (e, onValueChange, autoTrim) => {
-        if (autoTrim) {
-            e.target.value = e.target.value.trim();
-        }
-        onValueChange(e.target.value);
-    };
-    antInputRef = React.createRef();
-    getRef = () => this.props.inputRef ?? this.antInputRef;
-    createFocusOptions(focus) {
-        const type = focus || this.props.focus;
-        if (!type)
+import { ReactUtil } from "../../util/ReactUtil";
+import { useDidMountEffect } from "../../hooks/useDidMountEffect";
+const handleInputChange = (e, onValueChange, autoTrim) => {
+    if (autoTrim) {
+        e.target.value = e.target.value.trim();
+    }
+    onValueChange(e.target.value);
+};
+export const Input = ReactUtil.compound("Input", {
+    Readonly: (props) => React.createElement(AntInput, { onChange: () => { }, readOnly: true, disabled: true, ...props }),
+    Search: ({ onChange, ...rest }) => React.createElement(AntInput.Search, { onChange: e => handleInputChange(e, onChange), ...rest }),
+    TextArea: ({ onChange, ...rest }) => React.createElement(AntInput.TextArea, { onChange: e => handleInputChange(e, onChange), ...rest }),
+    Password: ({ onChange, ...rest }) => React.createElement(AntInput.Password, { onChange: e => handleInputChange(e, onChange), ...rest }),
+    Nullable: ({ value, onChange, ...rest }) => React.createElement(Input, { value: value || "", onChange: value => onChange(value.trim() ? value : null), ...rest }),
+    NullableTextArea: ({ value, onChange, ...rest }) => React.createElement(Input.TextArea, { value: value || "", onChange: value => onChange(value.trim() ? value : null), ...rest }),
+}, React.forwardRef((props, forwardRef) => {
+    const { onChange, autoFocus, autoTrim, inputRef, focus: focusProp, onClick, ...restProps } = props;
+    const antInputRef = React.useRef(null);
+    const ref = inputRef ?? antInputRef;
+    const createFocusOptions = (focusType) => {
+        if (!focusType)
             return undefined;
-        if (type === "prevent-scroll") {
+        if (focusType === "prevent-scroll") {
             return { preventScroll: true };
         }
         else {
-            return { cursor: type === "cursor-at-start" ? "start" : type === "cursor-at-last" ? "end" : "all" };
+            return { cursor: focusType === "cursor-at-start" ? "start" : focusType === "cursor-at-last" ? "end" : "all" };
         }
-    }
-    handleClick = event => {
-        this.getRef().current?.focus(this.createFocusOptions());
-        this.props.onClick?.(event);
     };
-    componentDidMount() {
-        if (this.props.autoFocus) {
-            this.getRef().current?.focus(this.createFocusOptions());
-        }
-    }
-    blur = () => this.getRef().current?.blur();
-    focus = (focusType) => (this.props.inputRef || this.antInputRef).current?.focus(this.createFocusOptions(focusType));
-    render() {
-        const { onChange, 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars -- not included in restProps
-        autoFocus, autoTrim, inputRef, 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars -- not included in restProps
-        onClick, ...restProps } = this.props;
-        return React.createElement(AntInput, { ...restProps, ref: inputRef || this.antInputRef, onClick: this.handleClick, onChange: e => Input.onChange(e, onChange, autoTrim) });
-    }
-}
+    React.useImperativeHandle(forwardRef, () => ({
+        blur: () => ref.current?.blur(),
+        focus: (focusType) => ref.current?.focus(createFocusOptions(focusType || focusProp)),
+    }));
+    useDidMountEffect(() => {
+        if (autoFocus)
+            ref.current?.focus(createFocusOptions(focusProp));
+    });
+    const handleClick = event => {
+        ref.current?.focus(createFocusOptions(focusProp));
+        onClick?.(event);
+    };
+    return React.createElement(AntInput, { ...restProps, ref: inputRef || antInputRef, onClick: handleClick, onChange: e => handleInputChange(e, onChange, autoTrim) });
+}));
 //# sourceMappingURL=index.js.map