@rjsf/antd 6.1.2 → 6.2.4

package/lib/widgets/AltDateTimeWidget/index.d.ts

@@ -1,14 +1,2 @@
 import { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
-declare function AltDateTimeWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: WidgetProps<T, S, F>): import("react/jsx-runtime").JSX.Element;
-declare namespace AltDateTimeWidget {
-    var defaultProps: {
-        time: boolean;
-        autofocus: boolean;
-        disabled: boolean;
-        options: {
-            yearsRange: number[];
-        };
-        readonly: boolean;
-    };
-}
-export default AltDateTimeWidget;
+export default function AltDateTimeWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ time, ...props }: WidgetProps<T, S, F>): import("react/jsx-runtime").JSX.Element;

package/lib/widgets/AltDateTimeWidget/index.js

@@ -1,11 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import _AltDateWidget from '../AltDateWidget/index.js';
-export default function AltDateTimeWidget(props) {
+export default function AltDateTimeWidget({ time = true, ...props }) {
     const { AltDateWidget } = props.registry.widgets;
-    return _jsx(AltDateWidget, { time: true, ...props });
+    return _jsx(AltDateWidget, { time: time, ...props });
 }
-AltDateTimeWidget.defaultProps = {
-    ..._AltDateWidget.defaultProps,
-    time: true,
-};
 //# sourceMappingURL=index.js.map

package/lib/widgets/AltDateTimeWidget/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/widgets/AltDateTimeWidget/index.tsx"],"names":[],"mappings":";AAEA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAIvC,KAA2B;IAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjD,OAAO,KAAC,aAAa,IAAC,IAAI,WAAK,KAAK,GAAI,CAAC;AAC3C,CAAC;AAED,iBAAiB,CAAC,YAAY,GAAG;IAC/B,GAAG,cAAc,CAAC,YAAY;IAC9B,IAAI,EAAE,IAAI;CACX,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/widgets/AltDateTimeWidget/index.tsx"],"names":[],"mappings":";AAEA,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAIvC,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,KAAK,EAAwB;IAC/C,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;IACjD,OAAO,KAAC,aAAa,IAAC,IAAI,EAAE,IAAI,KAAM,KAAK,GAAI,CAAC;AAClD,CAAC"}

package/lib/widgets/AltDateWidget/index.d.ts

@@ -1,14 +1,2 @@
 import { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
-declare function AltDateWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(props: WidgetProps<T, S, F>): import("react/jsx-runtime").JSX.Element;
-declare namespace AltDateWidget {
-    var defaultProps: {
-        autofocus: boolean;
-        disabled: boolean;
-        options: {
-            yearsRange: number[];
-        };
-        readonly: boolean;
-        time: boolean;
-    };
-}
-export default AltDateWidget;
+export default function AltDateWidget<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>({ autofocus, disabled, options, readonly, time, ...props }: WidgetProps<T, S, F>): import("react/jsx-runtime").JSX.Element;

package/lib/widgets/AltDateWidget/index.js

@@ -1,23 +1,19 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Row, Col, Button } from 'antd';
 import { DateElement, TranslatableString, useAltDateWidgetProps, } from '@rjsf/utils';
-export default function AltDateWidget(props) {
-    const { autofocus, disabled, id, name, onBlur, onFocus, options, readonly, registry } = props;
+export default function AltDateWidget({ autofocus = false, disabled = false, options, readonly = false, time = false, ...props }) {
+    const { id, name, onBlur, onFocus, registry } = props;
     const { formContext, translateString } = registry;
     const { rowGutter = 24 } = formContext;
-    const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps(props);
+    const realOptions = { yearsRange: [1900, new Date().getFullYear() + 2], ...options };
+    const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps({
+        ...props,
+        autofocus,
+        options: realOptions,
+    });
     return (_jsxs(Row, { gutter: [Math.floor(rowGutter / 2), Math.floor(rowGutter / 2)], children: [elements.map((elemProps, i) => {
                 const elemId = `${id}_${elemProps.type}`;
                 return (_jsx(Col, { flex: '88px', children: _jsx(DateElement, { rootId: id, name: name, select: handleChange, ...elemProps, disabled: disabled, readonly: readonly, registry: registry, onBlur: onBlur, onFocus: onFocus, autofocus: autofocus && i === 0 }) }, elemId));
             }), !options.hideNowButton && (_jsx(Col, { flex: '88px', children: _jsx(Button, { block: true, className: 'btn-now', onClick: handleSetNow, type: 'primary', children: translateString(TranslatableString.NowLabel) }) })), !options.hideClearButton && (_jsx(Col, { flex: '88px', children: _jsx(Button, { block: true, className: 'btn-clear', danger: true, onClick: handleClear, type: 'primary', children: translateString(TranslatableString.ClearLabel) }) }))] }));
 }
-AltDateWidget.defaultProps = {
-    autofocus: false,
-    disabled: false,
-    options: {
-        yearsRange: [1900, new Date().getFullYear() + 2],
-    },
-    readonly: false,
-    time: false,
-};
 //# sourceMappingURL=index.js.map

package/lib/widgets/AltDateWidget/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/widgets/AltDateWidget/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EACL,WAAW,EAKX,kBAAkB,EAClB,qBAAqB,GAEtB,MAAM,aAAa,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,aAAa,CAInC,KAA2B;IAC3B,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC9F,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,WAAgC,CAAC;IAC5D,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAE3F,OAAO,CACL,MAAC,GAAG,IAAC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,aAChE,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;gBAC7B,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACzC,OAAO,CACL,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,WAAW,IACV,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,YAAY,KAChB,SAAS,EACb,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,IAAI,CAAC,KAAK,CAAC,GAC/B,IAZkB,MAAM,CAatB,CACP,CAAC;YACJ,CAAC,CAAC,EACD,CAAC,OAAO,CAAC,aAAa,IAAI,CACzB,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,MAAM,IAAC,KAAK,QAAC,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAC,SAAS,YACpE,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GACtC,GACL,CACP,EACA,CAAC,OAAO,CAAC,eAAe,IAAI,CAC3B,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,MAAM,IAAC,KAAK,QAAC,SAAS,EAAC,WAAW,EAAC,MAAM,QAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAC,SAAS,YAC5E,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,GACxC,GACL,CACP,IACG,CACP,CAAC;AACJ,CAAC;AAED,aAAa,CAAC,YAAY,GAAG;IAC3B,SAAS,EAAE,KAAK;IAChB,QAAQ,EAAE,KAAK;IACf,OAAO,EAAE;QACP,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;KACjD;IACD,QAAQ,EAAE,KAAK;IACf,IAAI,EAAE,KAAK;CACZ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/widgets/AltDateWidget/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AACxC,OAAO,EACL,WAAW,EAKX,kBAAkB,EAClB,qBAAqB,GAEtB,MAAM,aAAa,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,aAAa,CAInC,EAAE,SAAS,GAAG,KAAK,EAAE,QAAQ,GAAG,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,GAAG,KAAK,EAAwB;IAChH,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACtD,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IAClD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,WAAgC,CAAC;IAC5D,MAAM,WAAW,GAAG,EAAE,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC;IACrF,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,qBAAqB,CAAC;QAClF,GAAG,KAAK;QACR,SAAS;QACT,OAAO,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,OAAO,CACL,MAAC,GAAG,IAAC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,aAChE,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;gBAC7B,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACzC,OAAO,CACL,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,WAAW,IACV,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,YAAY,KAChB,SAAS,EACb,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,IAAI,CAAC,KAAK,CAAC,GAC/B,IAZkB,MAAM,CAatB,CACP,CAAC;YACJ,CAAC,CAAC,EACD,CAAC,OAAO,CAAC,aAAa,IAAI,CACzB,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,MAAM,IAAC,KAAK,QAAC,SAAS,EAAC,SAAS,EAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAC,SAAS,YACpE,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GACtC,GACL,CACP,EACA,CAAC,OAAO,CAAC,eAAe,IAAI,CAC3B,KAAC,GAAG,IAAC,IAAI,EAAC,MAAM,YACd,KAAC,MAAM,IAAC,KAAK,QAAC,SAAS,EAAC,WAAW,EAAC,MAAM,QAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAC,SAAS,YAC5E,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,GACxC,GACL,CACP,IACG,CACP,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rjsf/antd",
-  "version": "6.1.2",
+  "version": "6.2.4",
   "description": "Ant Design theme, fields and widgets for react-jsonschema-form",
   "main": "dist/index.js",
   "module": "lib/index.js",
@@ -63,8 +63,8 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
-    "@rjsf/core": "^6.x",
-    "@rjsf/utils": "^6.x",
+    "@rjsf/core": "^6.2.x",
+    "@rjsf/utils": "^6.2.x",
     "antd": "^5.8.5",
     "dayjs": "^1.8.0",
     "react": ">=18"
@@ -77,9 +77,9 @@
   },
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
-    "@rjsf/core": "^6.x",
-    "@rjsf/snapshot-tests": "^6.x",
-    "@rjsf/utils": "^6.x",
+    "@rjsf/core": "^6.2.0",
+    "@rjsf/snapshot-tests": "^6.2.0",
+    "@rjsf/utils": "^6.2.0",
     "@rjsf/validator-ajv8": "^6.x",
     "@rollup/plugin-replace": "^6.0.3",
     "antd": "^5.27.6",

package/src/templates/BaseInputTemplate/index.tsx

@@ -1,4 +1,4 @@
-import { ChangeEvent, FocusEvent } from 'react';
+import { ChangeEvent, FocusEvent, MouseEvent, useCallback } from 'react';
 import { Input, InputNumber } from 'antd';
 import {
   ariaDescribedByIds,
@@ -47,6 +47,7 @@ export default function BaseInputTemplate<
   // through its own props. The step prop in Ant Design expects a number, not the string "any"
   const inputProps = getInputProps<T, S, F>(schema, type, options, false);
   const { readonlyAsDisabled = true } = formContext as GenericObjectType;
+  const { ClearButton } = registry.templates.ButtonTemplates;
 
   const handleNumberChange = (nextValue: number | null) => onChange(nextValue);
 
@@ -58,6 +59,15 @@ export default function BaseInputTemplate<
 
   const handleFocus = ({ target }: FocusEvent<HTMLInputElement>) => onFocus(id, target && target.value);
 
+  const handleClear = useCallback(
+    (e: MouseEvent) => {
+      e.preventDefault();
+      e.stopPropagation();
+      onChange(options.emptyValue ?? '');
+    },
+    [onChange, options.emptyValue],
+  );
+
   const input =
     inputProps.type === 'number' || inputProps.type === 'integer' ? (
       <InputNumber
@@ -94,6 +104,9 @@ export default function BaseInputTemplate<
   return (
     <>
       {input}
+      {options.allowClearTextInputs && !readonly && !disabled && value && (
+        <ClearButton registry={registry} onClick={handleClear} />
+      )}
       {Array.isArray(schema.examples) && (
         <datalist id={examplesId(id)}>
           {(schema.examples as string[])

package/src/templates/IconButton/index.tsx

@@ -4,6 +4,7 @@ import ArrowUpOutlined from '@ant-design/icons/ArrowUpOutlined';
 import CopyOutlined from '@ant-design/icons/CopyOutlined';
 import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
 import PlusCircleOutlined from '@ant-design/icons/PlusCircleOutlined';
+import CloseOutlined from '@ant-design/icons/CloseOutlined';
 import {
   getUiOptions,
   FormContextType,
@@ -102,3 +103,19 @@ export function RemoveButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F
     />
   );
 }
+
+export function ClearButton<T = any, S extends StrictRJSFSchema = RJSFSchema, F extends FormContextType = any>(
+  props: AntdIconButtonProps<T, S, F>,
+) {
+  const {
+    registry: { translateString },
+  } = props;
+  return (
+    <IconButton
+      title={translateString(TranslatableString.ClearButton)}
+      {...props}
+      iconType='link'
+      icon={<CloseOutlined />}
+    />
+  );
+}

package/src/templates/index.ts

@@ -5,7 +5,7 @@ import ArrayFieldTemplate from './ArrayFieldTemplate';
 import BaseInputTemplate from './BaseInputTemplate';
 import DescriptionField from './FieldDescriptionTemplate';
 import ErrorList from './ErrorList';
-import { AddButton, CopyButton, MoveDownButton, MoveUpButton, RemoveButton } from './IconButton';
+import { AddButton, CopyButton, MoveDownButton, MoveUpButton, RemoveButton, ClearButton } from './IconButton';
 import FieldErrorTemplate from './FieldErrorTemplate';
 import FieldTemplate from './FieldTemplate';
 import GridTemplate from './GridTemplate';
@@ -32,6 +32,7 @@ export function generateTemplates<
       MoveUpButton,
       RemoveButton,
       SubmitButton,
+      ClearButton,
     },
     DescriptionFieldTemplate: DescriptionField,
     ErrorListTemplate: ErrorList,

package/src/widgets/AltDateTimeWidget/index.tsx

@@ -1,17 +1,10 @@
 import { FormContextType, RJSFSchema, StrictRJSFSchema, WidgetProps } from '@rjsf/utils';
 
-import _AltDateWidget from '../AltDateWidget';
-
 export default function AltDateTimeWidget<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
->(props: WidgetProps<T, S, F>) {
+>({ time = true, ...props }: WidgetProps<T, S, F>) {
   const { AltDateWidget } = props.registry.widgets;
-  return <AltDateWidget time {...props} />;
+  return <AltDateWidget time={time} {...props} />;
 }
-
-AltDateTimeWidget.defaultProps = {
-  ..._AltDateWidget.defaultProps,
-  time: true,
-};

package/src/widgets/AltDateWidget/index.tsx

@@ -14,11 +14,16 @@ export default function AltDateWidget<
   T = any,
   S extends StrictRJSFSchema = RJSFSchema,
   F extends FormContextType = any,
->(props: WidgetProps<T, S, F>) {
-  const { autofocus, disabled, id, name, onBlur, onFocus, options, readonly, registry } = props;
+>({ autofocus = false, disabled = false, options, readonly = false, time = false, ...props }: WidgetProps<T, S, F>) {
+  const { id, name, onBlur, onFocus, registry } = props;
   const { formContext, translateString } = registry;
   const { rowGutter = 24 } = formContext as GenericObjectType;
-  const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps(props);
+  const realOptions = { yearsRange: [1900, new Date().getFullYear() + 2], ...options };
+  const { elements, handleChange, handleClear, handleSetNow } = useAltDateWidgetProps({
+    ...props,
+    autofocus,
+    options: realOptions,
+  });
 
   return (
     <Row gutter={[Math.floor(rowGutter / 2), Math.floor(rowGutter / 2)]}>
@@ -58,13 +63,3 @@ export default function AltDateWidget<
     </Row>
   );
 }
-
-AltDateWidget.defaultProps = {
-  autofocus: false,
-  disabled: false,
-  options: {
-    yearsRange: [1900, new Date().getFullYear() + 2],
-  },
-  readonly: false,
-  time: false,
-};