After review fixes (#674).

vazco · Dec 7, 2020 · 2f8b865 · 2f8b865
1 parent 0e26a21
commit 2f8b865
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 39 deletions.
diff --git a/packages/uniforms-antd/src/DateField.tsx b/packages/uniforms-antd/src/DateField.tsx
@@ -25,10 +25,11 @@ function Date({
       disabled={props.disabled}
       name={props.name}
       onChange={value => {
-        props.onChange(value ? value.toDate() : undefined);
+        props.readOnly
+          ? undefined
+          : props.onChange(value ? value.toDate() : undefined);
       }}
       placeholder={props.placeholder}
-      readOnly={props.readOnly}
       // @ts-ignore: `DatePicker` is an intersection.
       ref={props.inputRef}
       showTime={showTime}

diff --git a/packages/uniforms-antd/src/ListAddField.tsx b/packages/uniforms-antd/src/ListAddField.tsx
@@ -22,6 +22,7 @@ function ListAdd({
   disabled,
   icon = <PlusSquareOutlined />,
   name,
+  readOnly,
   size = 'small',
   style = defaultStyle,
   type = 'dashed',
@@ -44,9 +45,11 @@ function ListAdd({
       {...filterDOMProps(props)}
       disabled={!limitNotReached}
       icon={icon}
-      onClick={() => {
-        parent.onChange(parent.value!.concat([cloneDeep(value)]));
-      }}
+      onClick={() =>
+        readOnly
+          ? undefined
+          : parent.onChange(parent.value!.concat([cloneDeep(value)]))
+      }
       size={size}
       style={style}
       type={type}

diff --git a/packages/uniforms-antd/src/ListDelField.tsx b/packages/uniforms-antd/src/ListDelField.tsx
@@ -15,6 +15,7 @@ function ListDel({
   disabled,
   icon = <DeleteOutlined />,
   name,
+  readOnly,
   shape = 'circle-outline',
   size = 'small',
   type = 'ghost',
@@ -38,9 +39,13 @@ function ListDel({
       disabled={!limitNotReached}
       icon={icon}
       onClick={() => {
-        const value = parent.value!.slice();
-        value.splice(nameIndex, 1);
-        parent.onChange(value);
+        if (readOnly) {
+          undefined;
+        } else {
+          const value = parent.value!.slice();
+          value.splice(nameIndex, 1);
+          parent.onChange(value);
+        }
       }}
       shape={shape}
       size={size}

diff --git a/packages/uniforms-bootstrap3/src/ListAddField.tsx b/packages/uniforms-bootstrap3/src/ListAddField.tsx
@@ -16,10 +16,11 @@ export type ListAddFieldProps = HTMLFieldProps<
 >;
 
 function ListAdd({
-  name,
   addIcon,
   className,
   disabled,
+  name,
+  readOnly,
   value,
   ...props
 }: ListAddFieldProps) {
@@ -39,7 +40,7 @@ function ListAdd({
       {...filterDOMProps(props)}
       className={classnames('badge pull-right', className)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           parent.onChange(parent.value!.concat([cloneDeep(value)]));
         }
       }}

diff --git a/packages/uniforms-bootstrap3/src/ListDelField.tsx b/packages/uniforms-bootstrap3/src/ListDelField.tsx
@@ -15,9 +15,10 @@ export type ListDelFieldProps = HTMLFieldProps<
 >;
 
 function ListDel({
-  name,
   className,
   disabled,
+  name,
+  readOnly,
   removeIcon,
   ...props
 }: ListDelFieldProps) {
@@ -37,7 +38,7 @@ function ListDel({
       {...filterDOMProps(props)}
       className={classnames('badge', className)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           const value = parent.value!.slice();
           value.splice(nameIndex, 1);
           parent.onChange(value);

diff --git a/packages/uniforms-bootstrap4/src/ListAddField.tsx b/packages/uniforms-bootstrap4/src/ListAddField.tsx
@@ -16,10 +16,11 @@ export type ListAddFieldProps = HTMLFieldProps<
 >;
 
 function ListAdd({
-  name,
   addIcon,
   className,
   disabled,
+  name,
+  readOnly,
   value,
   ...props
 }: ListAddFieldProps) {
@@ -39,7 +40,7 @@ function ListAdd({
       {...filterDOMProps(props)}
       className={classnames('badge badge-pill float-right', className)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           parent.onChange(parent.value!.concat([cloneDeep(value)]));
         }
       }}

diff --git a/packages/uniforms-bootstrap4/src/ListDelField.tsx b/packages/uniforms-bootstrap4/src/ListDelField.tsx
@@ -15,9 +15,10 @@ export type ListDelFieldProps = HTMLFieldProps<
 >;
 
 function ListDel({
-  name,
   className,
   disabled,
+  name,
+  readOnly,
   removeIcon,
   ...props
 }: ListDelFieldProps) {
@@ -38,7 +39,7 @@ function ListDel({
       {...filterDOMProps(props)}
       className={classnames('badge badge-pill', className)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           const value = parent.value!.slice();
           value.splice(nameIndex, 1);
           parent.onChange(value);

diff --git a/packages/uniforms-material/src/ListAddField.tsx b/packages/uniforms-material/src/ListAddField.tsx
@@ -28,6 +28,7 @@ function ListAdd({
   icon = '+',
   margin = 'dense',
   name,
+  readOnly,
   value,
   variant,
   ...props
@@ -48,9 +49,11 @@ function ListAdd({
       <IconButton
         {...filterDOMProps(props)}
         disabled={!limitNotReached}
-        onClick={() => {
-          parent.onChange(parent.value!.concat([cloneDeep(value)]));
-        }}
+        onClick={() =>
+          readOnly
+            ? undefined
+            : parent.onChange(parent.value!.concat([cloneDeep(value)]))
+        }
       >
         {icon}
       </IconButton>

diff --git a/packages/uniforms-material/src/ListDelField.tsx b/packages/uniforms-material/src/ListDelField.tsx
@@ -14,7 +14,13 @@ export type ListDelFieldProps = FieldProps<
   { icon?: ReactNode }
 >;
 
-function ListDel({ disabled, icon = '-', name, ...props }: ListDelFieldProps) {
+function ListDel({
+  disabled,
+  icon = '-',
+  name,
+  readOnly,
+  ...props
+}: ListDelFieldProps) {
   const nameParts = joinName(null, name);
   const nameIndex = +nameParts[nameParts.length - 1];
   const parentName = joinName(nameParts.slice(0, -1));
@@ -32,9 +38,13 @@ function ListDel({ disabled, icon = '-', name, ...props }: ListDelFieldProps) {
       {...filterDOMProps(props)}
       disabled={!limitNotReached}
       onClick={() => {
-        const value = parent.value!.slice();
-        value.splice(nameIndex, 1);
-        parent.onChange(value);
+        if (readOnly) {
+          undefined;
+        } else {
+          const value = parent.value!.slice();
+          value.splice(nameIndex, 1);
+          parent.onChange(value);
+        }
       }}
     >
       {icon}

diff --git a/packages/uniforms-material/src/wrapField.tsx b/packages/uniforms-material/src/wrapField.tsx
@@ -26,7 +26,7 @@ export default function wrap(
     error: !!error,
     fullWidth: !!fullWidth,
     margin,
-    readOnly: !!readOnly,
+    readOnly,
     required,
     variant,
   };

diff --git a/packages/uniforms-semantic/src/ListAddField.tsx b/packages/uniforms-semantic/src/ListAddField.tsx
@@ -15,7 +15,13 @@ export type ListAddFieldProps = HTMLFieldProps<
   { initialCount?: number }
 >;
 
-function ListAdd({ disabled, name, value, ...props }: ListAddFieldProps) {
+function ListAdd({
+  disabled,
+  name,
+  readOnly,
+  value,
+  ...props
+}: ListAddFieldProps) {
   const nameParts = joinName(null, name);
   const parentName = joinName(nameParts.slice(0, -1));
   const parent = useField<{ maxCount?: number }, unknown[]>(
@@ -37,7 +43,7 @@ function ListAdd({ disabled, name, value, ...props }: ListAddFieldProps) {
         'fitted add icon',
       )}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           parent.onChange(parent.value!.concat([cloneDeep(value)]));
         }
       }}

diff --git a/packages/uniforms-semantic/src/ListDelField.tsx b/packages/uniforms-semantic/src/ListDelField.tsx
@@ -14,7 +14,7 @@ export type ListDelFieldProps = HTMLFieldProps<
   { name: string }
 >;
 
-function ListDel({ disabled, name, ...props }: ListDelFieldProps) {
+function ListDel({ disabled, name, readOnly, ...props }: ListDelFieldProps) {
   const nameParts = joinName(null, name);
   const nameIndex = +nameParts[nameParts.length - 1];
   const parentName = joinName(nameParts.slice(0, -1));
@@ -37,7 +37,7 @@ function ListDel({ disabled, name, ...props }: ListDelFieldProps) {
         'fitted close icon',
       )}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           const value = parent.value!.slice();
           value.splice(nameIndex, 1);
           parent.onChange(value);

diff --git a/packages/uniforms-unstyled/src/BoolField.tsx b/packages/uniforms-unstyled/src/BoolField.tsx
@@ -25,13 +25,7 @@ function Bool({
         disabled={disabled}
         id={id}
         name={name}
-        onChange={
-          disabled || readOnly
-            ? undefined
-            : () => {
-                onChange(!value);
-              }
-        }
+        onChange={() => (disabled || readOnly ? undefined : onChange(!value))}
         ref={inputRef}
         type="checkbox"
       />

diff --git a/packages/uniforms-unstyled/src/ListAddField.tsx b/packages/uniforms-unstyled/src/ListAddField.tsx
@@ -14,7 +14,13 @@ export type ListAddFieldProps = HTMLFieldProps<
   { initialCount?: number }
 >;
 
-function ListAdd({ disabled, name, value, ...props }: ListAddFieldProps) {
+function ListAdd({
+  disabled,
+  name,
+  readOnly,
+  value,
+  ...props
+}: ListAddFieldProps) {
   const nameParts = joinName(null, name);
   const parentName = joinName(nameParts.slice(0, -1));
   const parent = useField<{ maxCount?: number }, unknown[]>(
@@ -30,7 +36,7 @@ function ListAdd({ disabled, name, value, ...props }: ListAddFieldProps) {
     <span
       {...filterDOMProps(props)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           parent.onChange(parent.value!.concat([cloneDeep(value)]));
         }
       }}

diff --git a/packages/uniforms-unstyled/src/ListDelField.tsx b/packages/uniforms-unstyled/src/ListDelField.tsx
@@ -9,7 +9,7 @@ import {
 
 export type ListDelFieldProps = HTMLFieldProps<unknown, HTMLSpanElement>;
 
-function ListDel({ disabled, name, ...props }: ListDelFieldProps) {
+function ListDel({ disabled, name, readOnly, ...props }: ListDelFieldProps) {
   const nameParts = joinName(null, name);
   const nameIndex = +nameParts[nameParts.length - 1];
   const parentName = joinName(nameParts.slice(0, -1));
@@ -26,7 +26,7 @@ function ListDel({ disabled, name, ...props }: ListDelFieldProps) {
     <span
       {...filterDOMProps(props)}
       onClick={() => {
-        if (limitNotReached) {
+        if (limitNotReached && !readOnly) {
           const value = parent.value!.slice();
           value.splice(nameIndex, 1);
           parent.onChange(value);