diff options
author | MCMXC <16797721+mcmxcdev@users.noreply.github.com> | 2023-07-26 19:58:46 -0600 |
---|---|---|
committer | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2023-07-27 15:14:11 +0530 |
commit | 998d229d2978ea4418cb5dab3390b8901f0c2cb3 (patch) | |
tree | 3f0932493d4e6cdd24d50fb407c5eda913b3a360 | |
parent | 6.4.1-nightly.13 [skip ci] (diff) | |
download | ferdium-app-998d229d2978ea4418cb5dab3390b8901f0c2cb3.tar.gz ferdium-app-998d229d2978ea4418cb5dab3390b8901f0c2cb3.tar.zst ferdium-app-998d229d2978ea4418cb5dab3390b8901f0c2cb3.zip |
chore: upgrade mobx-react-form to latest
- upgrade mobx-react-form from v3 to v6
- remove stub mobx-react-form.d.ts since the dependency is written in TS now
- remove as any cast for new Form invocation in invite.tsx
- reuse Error component in Radio.tsx to get validation error message in red
- use FieldInterface type for field property instead of typeof Field in Radio.tsx
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | pnpm-lock.yaml | 8 | ||||
-rw-r--r-- | src/@types/mobx-react-form.d.ts | 1 | ||||
-rw-r--r-- | src/components/auth/Invite.tsx | 3 | ||||
-rw-r--r-- | src/components/ui/Radio.tsx | 11 |
5 files changed, 13 insertions, 12 deletions
diff --git a/package.json b/package.json index 9434e41f6..f99eac545 100644 --- a/package.json +++ b/package.json | |||
@@ -96,7 +96,7 @@ | |||
96 | "mobx": "6.10.0", | 96 | "mobx": "6.10.0", |
97 | "mobx-localstorage": "1.2.0", | 97 | "mobx-localstorage": "1.2.0", |
98 | "mobx-react": "7.6.0", | 98 | "mobx-react": "7.6.0", |
99 | "mobx-react-form": "3.2.0", | 99 | "mobx-react-form": "6.3.5", |
100 | "moment": "2.29.4", | 100 | "moment": "2.29.4", |
101 | "ms": "2.1.3", | 101 | "ms": "2.1.3", |
102 | "node-fetch": "2.6.11", | 102 | "node-fetch": "2.6.11", |
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 54deeb821..4c96e3e65 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml | |||
@@ -150,8 +150,8 @@ dependencies: | |||
150 | specifier: 7.6.0 | 150 | specifier: 7.6.0 |
151 | version: 7.6.0(mobx@6.10.0)(react-dom@18.2.0)(react@18.2.0) | 151 | version: 7.6.0(mobx@6.10.0)(react-dom@18.2.0)(react@18.2.0) |
152 | mobx-react-form: | 152 | mobx-react-form: |
153 | specifier: 3.2.0 | 153 | specifier: 6.3.5 |
154 | version: 3.2.0(mobx@6.10.0) | 154 | version: 6.3.5(mobx@6.10.0) |
155 | moment: | 155 | moment: |
156 | specifier: 2.29.4 | 156 | specifier: 2.29.4 |
157 | version: 2.29.4 | 157 | version: 2.29.4 |
@@ -9096,8 +9096,8 @@ packages: | |||
9096 | reactive-localstorage: 0.0.2 | 9096 | reactive-localstorage: 0.0.2 |
9097 | dev: false | 9097 | dev: false |
9098 | 9098 | ||
9099 | /mobx-react-form@3.2.0(mobx@6.10.0): | 9099 | /mobx-react-form@6.3.5(mobx@6.10.0): |
9100 | resolution: {integrity: sha512-7ddOvBulXW5VSMpxrok0A1VGZuWgn1cSvQ2HFXK2uMg631/37Anck7ASWEqK3AzKOaaP9/0kr7VCChqvhyotzQ==} | 9100 | resolution: {integrity: sha512-AsnfL1MC9Jm2wcF6hr7ayZjmqwrYw37LHMRFcjvXkmCSFEXM0/qKPA3/Ex3TOL4gmCEoBVoV/XhhfIuj5csUgQ==} |
9101 | engines: {node: '>=8.0.0'} | 9101 | engines: {node: '>=8.0.0'} |
9102 | peerDependencies: | 9102 | peerDependencies: |
9103 | mobx: ^6.0.0 | 9103 | mobx: ^6.0.0 |
diff --git a/src/@types/mobx-react-form.d.ts b/src/@types/mobx-react-form.d.ts deleted file mode 100644 index 4e19dc1c2..000000000 --- a/src/@types/mobx-react-form.d.ts +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | declare module 'mobx-react-form'; | ||
diff --git a/src/components/auth/Invite.tsx b/src/components/auth/Invite.tsx index 4f2cb19fe..0d39d861a 100644 --- a/src/components/auth/Invite.tsx +++ b/src/components/auth/Invite.tsx | |||
@@ -86,8 +86,7 @@ class Invite extends Component<IProps, IState> { | |||
86 | }, | 86 | }, |
87 | }, | 87 | }, |
88 | }), | 88 | }), |
89 | // TODO: [TS DEBT] need to fix this type once mobx-react-form is updated to next version | 89 | ], |
90 | ] as any, | ||
91 | }, | 90 | }, |
92 | }); | 91 | }); |
93 | } | 92 | } |
diff --git a/src/components/ui/Radio.tsx b/src/components/ui/Radio.tsx index b5be64c5d..1f41deedc 100644 --- a/src/components/ui/Radio.tsx +++ b/src/components/ui/Radio.tsx | |||
@@ -1,10 +1,11 @@ | |||
1 | import { Component } from 'react'; | 1 | import { Component } from 'react'; |
2 | import { observer } from 'mobx-react'; | 2 | import { observer } from 'mobx-react'; |
3 | import { Field } from 'mobx-react-form'; | ||
4 | import classnames from 'classnames'; | 3 | import classnames from 'classnames'; |
4 | import FieldInterface from 'mobx-react-form/lib/models/FieldInterface'; | ||
5 | import Error from './error'; | ||
5 | 6 | ||
6 | type Props = { | 7 | type Props = { |
7 | field: typeof Field; | 8 | field: FieldInterface; |
8 | className: string; | 9 | className: string; |
9 | focus: boolean; | 10 | focus: boolean; |
10 | showLabel: boolean; | 11 | showLabel: boolean; |
@@ -47,7 +48,8 @@ class Radio extends Component<Props> { | |||
47 | </label> | 48 | </label> |
48 | )} | 49 | )} |
49 | <div className="franz-form__radio-wrapper"> | 50 | <div className="franz-form__radio-wrapper"> |
50 | {field.options.map(type => ( | 51 | {/* @ts-expect-error Property 'map' does not exist on type 'OptionsModel'. */} |
52 | {field.options?.map(type => ( | ||
51 | <label | 53 | <label |
52 | key={type.value} | 54 | key={type.value} |
53 | htmlFor={`${field.id}-${type.value}`} | 55 | htmlFor={`${field.id}-${type.value}`} |
@@ -68,7 +70,8 @@ class Radio extends Component<Props> { | |||
68 | </label> | 70 | </label> |
69 | ))} | 71 | ))} |
70 | </div> | 72 | </div> |
71 | {field.error && <div className="franz-form__error">{field.error}</div>} | 73 | |
74 | {field.error && <Error message={field.error} />} | ||
72 | </div> | 75 | </div> |
73 | ); | 76 | ); |
74 | } | 77 | } |