ferns-ui 1.13.0 → 1.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ActionSheet.js +14 -11
- package/dist/ActionSheet.js.map +1 -1
- package/dist/AddressField.js +1 -1
- package/dist/AddressField.js.map +1 -1
- package/dist/Badge.js +1 -1
- package/dist/Badge.js.map +1 -1
- package/dist/Banner.js +1 -1
- package/dist/Banner.js.map +1 -1
- package/dist/Box.js +3 -3
- package/dist/Box.js.map +1 -1
- package/dist/Box.test.js +36 -36
- package/dist/Box.test.js.map +1 -1
- package/dist/CheckBox.js.map +1 -1
- package/dist/Common.d.ts +6 -1
- package/dist/DataTable.js +2 -3
- package/dist/DataTable.js.map +1 -1
- package/dist/DateTimeField.js +22 -22
- package/dist/DateTimeField.js.map +1 -1
- package/dist/FernsProvider.js +1 -1
- package/dist/FernsProvider.js.map +1 -1
- package/dist/Heading.js +1 -1
- package/dist/Heading.js.map +1 -1
- package/dist/Hyperlink.js +1 -1
- package/dist/Hyperlink.js.map +1 -1
- package/dist/IconButton.js +1 -1
- package/dist/IconButton.js.map +1 -1
- package/dist/Image.js.map +1 -1
- package/dist/MobileAddressAutoComplete.js +1 -1
- package/dist/MobileAddressAutoComplete.js.map +1 -1
- package/dist/Modal.d.ts +1 -1
- package/dist/Modal.js +29 -16
- package/dist/Modal.js.map +1 -1
- package/dist/NumberField.js +10 -4
- package/dist/NumberField.js.map +1 -1
- package/dist/NumberPickerActionSheet.d.ts +1 -3
- package/dist/NumberPickerActionSheet.js +0 -3
- package/dist/NumberPickerActionSheet.js.map +1 -1
- package/dist/Page.js +1 -1
- package/dist/Page.js.map +1 -1
- package/dist/Pagination.js +2 -2
- package/dist/Pagination.js.map +1 -1
- package/dist/Permissions.d.ts +1 -1
- package/dist/Permissions.js +2 -2
- package/dist/Permissions.js.map +1 -1
- package/dist/PickerSelect.js +1 -1
- package/dist/PickerSelect.js.map +1 -1
- package/dist/SectionDivider.js +1 -1
- package/dist/SectionDivider.js.map +1 -1
- package/dist/SegmentedControl.js.map +1 -1
- package/dist/Signature.native.js +2 -2
- package/dist/Signature.native.js.map +1 -1
- package/dist/SignatureField.js +2 -2
- package/dist/SignatureField.js.map +1 -1
- package/dist/Slider.js +3 -3
- package/dist/Slider.js.map +1 -1
- package/dist/SplitPage.js +7 -7
- package/dist/SplitPage.js.map +1 -1
- package/dist/SplitPage.native.js +4 -6
- package/dist/SplitPage.native.js.map +1 -1
- package/dist/TapToEdit.js +3 -3
- package/dist/TapToEdit.js.map +1 -1
- package/dist/Text.js +1 -1
- package/dist/Text.js.map +1 -1
- package/dist/TextArea.test.js.map +1 -1
- package/dist/TextField.test.js +3 -3
- package/dist/TextField.test.js.map +1 -1
- package/dist/TextFieldNumberActionSheet.d.ts +2 -4
- package/dist/TextFieldNumberActionSheet.js +1 -4
- package/dist/TextFieldNumberActionSheet.js.map +1 -1
- package/dist/Tooltip.js +37 -19
- package/dist/Tooltip.js.map +1 -1
- package/dist/Unifier.d.ts +0 -1
- package/dist/Unifier.js.map +1 -1
- package/dist/Utilities.d.ts +1 -1
- package/dist/Utilities.js +2 -3
- package/dist/Utilities.js.map +1 -1
- package/dist/WebAddressAutocomplete.js +2 -1
- package/dist/WebAddressAutocomplete.js.map +1 -1
- package/dist/index.d.ts +10 -11
- package/dist/index.js +10 -10
- package/dist/index.js.map +1 -1
- package/dist/table/Table.js +14 -15
- package/dist/table/Table.js.map +1 -1
- package/dist/table/TableHeaderCell.js +2 -2
- package/dist/table/TableHeaderCell.js.map +1 -1
- package/dist/useStoredState.js +4 -2
- package/dist/useStoredState.js.map +1 -1
- package/package.json +5 -19
- package/src/ActionSheet.tsx +26 -22
- package/src/AddressField.tsx +1 -1
- package/src/Badge.tsx +1 -1
- package/src/Banner.tsx +1 -1
- package/src/Box.test.tsx +71 -70
- package/src/Box.tsx +21 -9
- package/src/CheckBox.tsx +7 -1
- package/src/Common.ts +6 -1
- package/src/DataTable.tsx +2 -5
- package/src/DateTimeField.tsx +22 -22
- package/src/FernsProvider.tsx +1 -4
- package/src/Heading.tsx +1 -1
- package/src/Hyperlink.tsx +1 -1
- package/src/IconButton.tsx +2 -2
- package/src/Image.tsx +1 -0
- package/src/MobileAddressAutoComplete.tsx +1 -1
- package/src/Modal.tsx +41 -20
- package/src/NumberField.tsx +10 -4
- package/src/NumberPickerActionSheet.tsx +1 -5
- package/src/Page.tsx +1 -1
- package/src/Pagination.tsx +2 -11
- package/src/Permissions.ts +2 -2
- package/src/PickerSelect.tsx +1 -1
- package/src/SectionDivider.tsx +1 -1
- package/src/SegmentedControl.tsx +3 -1
- package/src/Signature.native.tsx +2 -2
- package/src/SignatureField.tsx +2 -2
- package/src/Slider.tsx +10 -17
- package/src/SplitPage.native.tsx +2 -4
- package/src/SplitPage.tsx +4 -4
- package/src/TapToEdit.tsx +3 -7
- package/src/Text.tsx +1 -1
- package/src/TextArea.test.tsx +27 -43
- package/src/TextField.test.tsx +3 -4
- package/src/TextFieldNumberActionSheet.tsx +3 -7
- package/src/Tooltip.tsx +44 -22
- package/src/Unifier.ts +1 -3
- package/src/Utilities.tsx +3 -4
- package/src/WebAddressAutocomplete.tsx +1 -1
- package/src/index.tsx +11 -11
- package/src/table/Table.tsx +34 -36
- package/src/table/TableHeaderCell.tsx +2 -2
- package/src/useStoredState.ts +13 -11
package/src/DateTimeField.tsx
CHANGED
|
@@ -262,20 +262,20 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
262
262
|
if (type === "date" || type === "datetime") {
|
|
263
263
|
if (fieldIndex === 0) {
|
|
264
264
|
// Month
|
|
265
|
-
const monthNum = parseInt(fieldValue);
|
|
266
|
-
if (isNaN(monthNum) || monthNum < 1 || monthNum > 12) {
|
|
265
|
+
const monthNum = parseInt(fieldValue, 10);
|
|
266
|
+
if (Number.isNaN(monthNum) || monthNum < 1 || monthNum > 12) {
|
|
267
267
|
return "Month must be between 1 and 12";
|
|
268
268
|
}
|
|
269
269
|
} else if (fieldIndex === 1) {
|
|
270
270
|
// Day
|
|
271
|
-
const dayNum = parseInt(fieldValue);
|
|
272
|
-
if (isNaN(dayNum) || dayNum < 1 || dayNum > 31) {
|
|
271
|
+
const dayNum = parseInt(fieldValue, 10);
|
|
272
|
+
if (Number.isNaN(dayNum) || dayNum < 1 || dayNum > 31) {
|
|
273
273
|
return "Day must be between 1 and 31";
|
|
274
274
|
}
|
|
275
275
|
} else if (fieldIndex === 2) {
|
|
276
276
|
// Year
|
|
277
|
-
const yearNum = parseInt(fieldValue);
|
|
278
|
-
if (isNaN(yearNum) || yearNum < 1900 || yearNum > 2100) {
|
|
277
|
+
const yearNum = parseInt(fieldValue, 10);
|
|
278
|
+
if (Number.isNaN(yearNum) || yearNum < 1900 || yearNum > 2100) {
|
|
279
279
|
return "Year must be between 1900 and 2100";
|
|
280
280
|
}
|
|
281
281
|
}
|
|
@@ -284,14 +284,14 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
284
284
|
if (type === "time" || type === "datetime") {
|
|
285
285
|
if (fieldIndex === (type === "time" ? 0 : 3)) {
|
|
286
286
|
// Hour
|
|
287
|
-
const hourNum = parseInt(fieldValue);
|
|
288
|
-
if (isNaN(hourNum) || hourNum < 1 || hourNum > 12) {
|
|
287
|
+
const hourNum = parseInt(fieldValue, 10);
|
|
288
|
+
if (Number.isNaN(hourNum) || hourNum < 1 || hourNum > 12) {
|
|
289
289
|
return "Hour must be between 1 and 12";
|
|
290
290
|
}
|
|
291
291
|
} else if (fieldIndex === (type === "time" ? 1 : 4)) {
|
|
292
292
|
// Minute
|
|
293
|
-
const minuteNum = parseInt(fieldValue);
|
|
294
|
-
if (isNaN(minuteNum) || minuteNum < 0 || minuteNum > 59) {
|
|
293
|
+
const minuteNum = parseInt(fieldValue, 10);
|
|
294
|
+
if (Number.isNaN(minuteNum) || minuteNum < 0 || minuteNum > 59) {
|
|
295
295
|
return "Minute must be between 0 and 59";
|
|
296
296
|
}
|
|
297
297
|
}
|
|
@@ -323,7 +323,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
323
323
|
if (!monthVal || !dayVal || !yearVal || !hour || !minuteVal) {
|
|
324
324
|
return undefined;
|
|
325
325
|
}
|
|
326
|
-
let hourNum = parseInt(hourVal);
|
|
326
|
+
let hourNum = parseInt(hourVal, 10);
|
|
327
327
|
if (ampPmVal === "pm" && hourNum !== 12) {
|
|
328
328
|
hourNum += 12;
|
|
329
329
|
} else if (ampPmVal === "am" && hourNum === 12) {
|
|
@@ -331,11 +331,11 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
331
331
|
}
|
|
332
332
|
date = DateTime.fromObject(
|
|
333
333
|
{
|
|
334
|
-
year: parseInt(yearVal),
|
|
335
|
-
month: parseInt(monthVal),
|
|
336
|
-
day: parseInt(dayVal),
|
|
334
|
+
year: parseInt(yearVal, 10),
|
|
335
|
+
month: parseInt(monthVal, 10),
|
|
336
|
+
day: parseInt(dayVal, 10),
|
|
337
337
|
hour: hourNum,
|
|
338
|
-
minute: parseInt(minuteVal),
|
|
338
|
+
minute: parseInt(minuteVal, 10),
|
|
339
339
|
second: 0,
|
|
340
340
|
millisecond: 0,
|
|
341
341
|
},
|
|
@@ -349,9 +349,9 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
349
349
|
}
|
|
350
350
|
date = DateTime.fromObject(
|
|
351
351
|
{
|
|
352
|
-
year: parseInt(yearVal),
|
|
353
|
-
month: parseInt(monthVal),
|
|
354
|
-
day: parseInt(dayVal),
|
|
352
|
+
year: parseInt(yearVal, 10),
|
|
353
|
+
month: parseInt(monthVal, 10),
|
|
354
|
+
day: parseInt(dayVal, 10),
|
|
355
355
|
hour: 0,
|
|
356
356
|
minute: 0,
|
|
357
357
|
second: 0,
|
|
@@ -365,7 +365,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
365
365
|
if (!hour || !minuteVal) {
|
|
366
366
|
return undefined;
|
|
367
367
|
}
|
|
368
|
-
let hourNum = parseInt(hour);
|
|
368
|
+
let hourNum = parseInt(hour, 10);
|
|
369
369
|
if (ampPmVal === "pm" && hourNum !== 12) {
|
|
370
370
|
hourNum += 12;
|
|
371
371
|
} else if (ampPmVal === "am" && hourNum === 12) {
|
|
@@ -374,7 +374,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
374
374
|
date = DateTime.fromObject(
|
|
375
375
|
{
|
|
376
376
|
hour: hourNum,
|
|
377
|
-
minute: parseInt(minuteVal),
|
|
377
|
+
minute: parseInt(minuteVal, 10),
|
|
378
378
|
second: 0,
|
|
379
379
|
millisecond: 0,
|
|
380
380
|
},
|
|
@@ -404,7 +404,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
404
404
|
// so it's always a valid time and easier to edit.
|
|
405
405
|
// This lets users freely edit or clear the minute field without breaking the time format.
|
|
406
406
|
const finalValue = numericValue === "" ? "00" : numericValue.slice(-2);
|
|
407
|
-
const minuteNum = parseInt(finalValue);
|
|
407
|
+
const minuteNum = parseInt(finalValue, 10);
|
|
408
408
|
|
|
409
409
|
// Update the minute state so the UI reflects the latest input,
|
|
410
410
|
// even if it's temporarily invalid
|
|
@@ -412,7 +412,7 @@ export const DateTimeField: FC<DateTimeFieldProps> = ({
|
|
|
412
412
|
setMinute(finalValue);
|
|
413
413
|
|
|
414
414
|
// Only update ref and result if it's a valid minute value
|
|
415
|
-
if (!isNaN(minuteNum) && minuteNum >= 0 && minuteNum <= 59) {
|
|
415
|
+
if (!Number.isNaN(minuteNum) && minuteNum >= 0 && minuteNum <= 59) {
|
|
416
416
|
pendingValueRef.current = {minute: finalValue};
|
|
417
417
|
setFieldErrors((prev) => ({...prev, [index]: undefined}));
|
|
418
418
|
|
package/src/FernsProvider.tsx
CHANGED
|
@@ -9,10 +9,7 @@ import {Toast} from "./Toast";
|
|
|
9
9
|
export const FernsProvider: FC<{
|
|
10
10
|
children: React.ReactNode;
|
|
11
11
|
openAPISpecUrl?: string;
|
|
12
|
-
}> = ({
|
|
13
|
-
children,
|
|
14
|
-
openAPISpecUrl,
|
|
15
|
-
}) => {
|
|
12
|
+
}> = ({children, openAPISpecUrl}) => {
|
|
16
13
|
return (
|
|
17
14
|
<ThemeProvider>
|
|
18
15
|
<ToastProvider
|
package/src/Heading.tsx
CHANGED
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
useFonts,
|
|
5
5
|
} from "@expo-google-fonts/titillium-web";
|
|
6
6
|
import React from "react";
|
|
7
|
-
import {
|
|
7
|
+
import {Text as NativeText, Platform, StyleProp, TextStyle} from "react-native";
|
|
8
8
|
|
|
9
9
|
import {HeadingProps} from "./Common";
|
|
10
10
|
import {useTheme} from "./Theme";
|
package/src/Hyperlink.tsx
CHANGED
|
@@ -111,7 +111,7 @@ class HyperlinkComponent extends React.Component<HyperlinkProps> {
|
|
|
111
111
|
component.props.children.substring(_lastIndex, component.props.children.length)
|
|
112
112
|
);
|
|
113
113
|
return React.cloneElement(component, componentProps, elements);
|
|
114
|
-
} catch (
|
|
114
|
+
} catch (_error) {
|
|
115
115
|
return component;
|
|
116
116
|
}
|
|
117
117
|
};
|
package/src/IconButton.tsx
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import FontAwesome6 from "@expo/vector-icons/FontAwesome6";
|
|
2
2
|
import debounce from "lodash/debounce";
|
|
3
3
|
import React, {FC, useState} from "react";
|
|
4
|
-
import {ActivityIndicator,
|
|
4
|
+
import {ActivityIndicator, Text as NativeText, Pressable, View} from "react-native";
|
|
5
5
|
|
|
6
6
|
import {IconButtonProps} from "./Common";
|
|
7
7
|
import {isMobileDevice} from "./MediaQuery";
|
|
@@ -98,7 +98,7 @@ const IconButtonComponent: FC<IconButtonProps> = ({
|
|
|
98
98
|
return (
|
|
99
99
|
<Pressable
|
|
100
100
|
accessibilityHint={
|
|
101
|
-
accessibilityHint ?? withConfirmation
|
|
101
|
+
(accessibilityHint ?? withConfirmation)
|
|
102
102
|
? `Opens a confirmation dialog to confirm ${accessLabel}`
|
|
103
103
|
: `Press to perform ${accessLabel} action`
|
|
104
104
|
}
|
package/src/Image.tsx
CHANGED
|
@@ -108,7 +108,7 @@ export const MobileAddressAutocomplete = ({
|
|
|
108
108
|
handleAddressChange(event.nativeEvent.text);
|
|
109
109
|
},
|
|
110
110
|
}}
|
|
111
|
-
onPress={(
|
|
111
|
+
onPress={(_data, details = null) => {
|
|
112
112
|
const addressComponents = details?.address_components;
|
|
113
113
|
const formattedAddressObject = processAddressComponents(addressComponents, {
|
|
114
114
|
includeCounty,
|
package/src/Modal.tsx
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
import React, {FC, useEffect, useRef} from "react";
|
|
2
|
-
import {Dimensions, DimensionValue, Modal as RNModal,
|
|
2
|
+
import {Dimensions, DimensionValue, Pressable, Modal as RNModal, View} from "react-native";
|
|
3
3
|
import ActionSheet, {ActionSheetRef} from "react-native-actions-sheet";
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
PanGestureHandlerStateChangeEvent,
|
|
7
|
-
State,
|
|
8
|
-
} from "react-native-gesture-handler";
|
|
4
|
+
import {Gesture, GestureDetector} from "react-native-gesture-handler";
|
|
5
|
+
import {runOnJS} from "react-native-reanimated";
|
|
9
6
|
|
|
10
7
|
import {Button} from "./Button";
|
|
11
|
-
import {ModalProps} from "./Common";
|
|
8
|
+
import type {ModalProps} from "./Common";
|
|
12
9
|
import {Heading} from "./Heading";
|
|
13
10
|
import {Icon} from "./Icon";
|
|
14
11
|
import {isMobileDevice} from "./MediaQuery";
|
|
@@ -129,7 +126,13 @@ const ModalContent: FC<{
|
|
|
129
126
|
</View>
|
|
130
127
|
)}
|
|
131
128
|
{children && (
|
|
132
|
-
<View
|
|
129
|
+
<View
|
|
130
|
+
style={{
|
|
131
|
+
marginTop: text ? 0 : 12,
|
|
132
|
+
width: "100%",
|
|
133
|
+
flex: isMobile ? undefined : 1,
|
|
134
|
+
}}
|
|
135
|
+
>
|
|
133
136
|
{children}
|
|
134
137
|
</View>
|
|
135
138
|
)}
|
|
@@ -163,6 +166,7 @@ const ModalContent: FC<{
|
|
|
163
166
|
|
|
164
167
|
export const Modal: FC<ModalProps> = ({
|
|
165
168
|
children,
|
|
169
|
+
persistOnBackgroundClick = false,
|
|
166
170
|
primaryButtonDisabled = false,
|
|
167
171
|
primaryButtonText,
|
|
168
172
|
secondaryButtonText,
|
|
@@ -200,11 +204,12 @@ export const Modal: FC<ModalProps> = ({
|
|
|
200
204
|
}
|
|
201
205
|
};
|
|
202
206
|
|
|
203
|
-
const
|
|
204
|
-
if (
|
|
205
|
-
handleDismiss
|
|
207
|
+
const dragToClose = Gesture.Pan().onEnd((event) => {
|
|
208
|
+
if (event.translationY > 20) {
|
|
209
|
+
// Gesture callbacks run on the UI thread, runOnJS is required to safely invoke handleDismiss on the JS thread
|
|
210
|
+
runOnJS(handleDismiss)();
|
|
206
211
|
}
|
|
207
|
-
};
|
|
212
|
+
});
|
|
208
213
|
|
|
209
214
|
// Open the action sheet ref when the visible prop changes.
|
|
210
215
|
useEffect(() => {
|
|
@@ -217,6 +222,7 @@ export const Modal: FC<ModalProps> = ({
|
|
|
217
222
|
const sizePx = getModalSize(size);
|
|
218
223
|
|
|
219
224
|
const modalContentProps = {
|
|
225
|
+
persistOnBackgroundClick,
|
|
220
226
|
title,
|
|
221
227
|
subtitle,
|
|
222
228
|
text,
|
|
@@ -233,13 +239,22 @@ export const Modal: FC<ModalProps> = ({
|
|
|
233
239
|
|
|
234
240
|
if (isMobile) {
|
|
235
241
|
return (
|
|
236
|
-
<ActionSheet
|
|
237
|
-
|
|
238
|
-
|
|
242
|
+
<ActionSheet
|
|
243
|
+
ref={actionSheetRef}
|
|
244
|
+
closeOnTouchBackdrop={!persistOnBackgroundClick}
|
|
245
|
+
// Disable ActionSheet's built-in gestures to avoid conflicts with scrolling
|
|
246
|
+
gestureEnabled={false}
|
|
247
|
+
onClose={handleDismiss}
|
|
248
|
+
>
|
|
249
|
+
<View>
|
|
250
|
+
{/* Attach our own swipe-to-dismiss gesture to the top handle */}
|
|
251
|
+
<GestureDetector gesture={dragToClose}>
|
|
239
252
|
<View
|
|
240
253
|
accessibilityHint="Pull down to close the modal"
|
|
241
254
|
aria-label="Pull down bar"
|
|
242
255
|
aria-role="adjustable"
|
|
256
|
+
// add hitSlop to make the bar easier to hit since it's small
|
|
257
|
+
hitSlop={{top: 20, bottom: 20, left: 50, right: 50}}
|
|
243
258
|
style={{
|
|
244
259
|
justifyContent: "center",
|
|
245
260
|
alignItems: "center",
|
|
@@ -252,9 +267,10 @@ export const Modal: FC<ModalProps> = ({
|
|
|
252
267
|
marginTop: 10,
|
|
253
268
|
}}
|
|
254
269
|
/>
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
270
|
+
</GestureDetector>
|
|
271
|
+
|
|
272
|
+
<ModalContent {...modalContentProps}>{children}</ModalContent>
|
|
273
|
+
</View>
|
|
258
274
|
</ActionSheet>
|
|
259
275
|
);
|
|
260
276
|
} else {
|
|
@@ -267,9 +283,14 @@ export const Modal: FC<ModalProps> = ({
|
|
|
267
283
|
justifyContent: "center",
|
|
268
284
|
alignItems: "center",
|
|
269
285
|
}}
|
|
270
|
-
onPress={handleDismiss}
|
|
286
|
+
onPress={persistOnBackgroundClick ? undefined : handleDismiss}
|
|
271
287
|
>
|
|
272
|
-
<Pressable
|
|
288
|
+
<Pressable
|
|
289
|
+
style={{cursor: "auto"}}
|
|
290
|
+
onPress={(e) => {
|
|
291
|
+
persistOnBackgroundClick ? null : e.stopPropagation();
|
|
292
|
+
}}
|
|
293
|
+
>
|
|
273
294
|
<ModalContent {...modalContentProps}>{children}</ModalContent>
|
|
274
295
|
</Pressable>
|
|
275
296
|
</Pressable>
|
package/src/NumberField.tsx
CHANGED
|
@@ -24,8 +24,8 @@ export const NumberField: FC<NumberFieldProps> = ({
|
|
|
24
24
|
if (!v) {
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
const num = type === "number" ? parseInt(v) : parseFloat(v);
|
|
28
|
-
if (isNaN(num) || (type === "number" && v.match(/[^0-9]/) !== null)) {
|
|
27
|
+
const num = type === "number" ? parseInt(v, 10) : parseFloat(v);
|
|
28
|
+
if (Number.isNaN(num) || (type === "number" && v.match(/[^0-9]/) !== null)) {
|
|
29
29
|
return "Value must be an integer";
|
|
30
30
|
} else if (
|
|
31
31
|
(type === "decimal" && v.match(/[^0-9.]+/) !== null) ||
|
|
@@ -47,13 +47,19 @@ export const NumberField: FC<NumberFieldProps> = ({
|
|
|
47
47
|
// Only return the value if it is a valid number
|
|
48
48
|
const localOnChange = useCallback(
|
|
49
49
|
(v: string) => {
|
|
50
|
-
|
|
50
|
+
if (type === "decimal" && v === ".") {
|
|
51
|
+
// if type is decimal and dot is the first character add 0 before it
|
|
52
|
+
setValue("0.");
|
|
53
|
+
rest.onChange("0.");
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
51
56
|
const err = getError(v);
|
|
52
57
|
if (!err) {
|
|
58
|
+
setValue(v);
|
|
53
59
|
rest.onChange(v);
|
|
54
60
|
}
|
|
55
61
|
},
|
|
56
|
-
[getError, rest]
|
|
62
|
+
[getError, rest, type]
|
|
57
63
|
);
|
|
58
64
|
|
|
59
65
|
return <TextField {...rest} errorText={error} value={value} onChange={localOnChange} />;
|
|
@@ -9,16 +9,12 @@ import {NumberPickerActionSheetProps} from "./Common";
|
|
|
9
9
|
|
|
10
10
|
const PICKER_HEIGHT = 104;
|
|
11
11
|
|
|
12
|
-
|
|
12
|
+
type NumberPickerActionSheetState = {};
|
|
13
13
|
|
|
14
14
|
export class NumberPickerActionSheet extends React.Component<
|
|
15
15
|
NumberPickerActionSheetProps,
|
|
16
16
|
NumberPickerActionSheetState
|
|
17
17
|
> {
|
|
18
|
-
constructor(props: NumberPickerActionSheetProps) {
|
|
19
|
-
super(props);
|
|
20
|
-
}
|
|
21
|
-
|
|
22
18
|
render() {
|
|
23
19
|
return (
|
|
24
20
|
<ActionSheet ref={this.props.actionSheetRef} bounceOnOpen gestureEnabled>
|
package/src/Page.tsx
CHANGED
|
@@ -47,7 +47,7 @@ export class Page extends React.Component<PageProps, {}> {
|
|
|
47
47
|
<Button
|
|
48
48
|
text={this.props.rightButton}
|
|
49
49
|
variant="muted"
|
|
50
|
-
onClick={() => this.props.rightButtonOnClick
|
|
50
|
+
onClick={() => this.props.rightButtonOnClick?.()}
|
|
51
51
|
/>
|
|
52
52
|
</Box>
|
|
53
53
|
)}
|
package/src/Pagination.tsx
CHANGED
|
@@ -11,12 +11,7 @@ const PaginationButton: FC<{
|
|
|
11
11
|
onClick: () => void;
|
|
12
12
|
totalPages?: number;
|
|
13
13
|
page?: number;
|
|
14
|
-
}> = ({
|
|
15
|
-
type,
|
|
16
|
-
onClick,
|
|
17
|
-
totalPages = 1,
|
|
18
|
-
page = 1,
|
|
19
|
-
}) => {
|
|
14
|
+
}> = ({type, onClick, totalPages = 1, page = 1}) => {
|
|
20
15
|
let icon: IconName;
|
|
21
16
|
let disabled = false;
|
|
22
17
|
|
|
@@ -56,11 +51,7 @@ const PaginationNumber: FC<{
|
|
|
56
51
|
number: number | "more";
|
|
57
52
|
current: boolean;
|
|
58
53
|
onClick: () => void;
|
|
59
|
-
}> = ({
|
|
60
|
-
number,
|
|
61
|
-
current,
|
|
62
|
-
onClick,
|
|
63
|
-
}) => {
|
|
54
|
+
}> = ({number, current, onClick}) => {
|
|
64
55
|
// Shortcut to make rendering the number buttons easier.
|
|
65
56
|
if (number === "more") {
|
|
66
57
|
return <PaginationButton type="more" onClick={() => {}} />;
|
package/src/Permissions.ts
CHANGED
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
// import Permissions from "react-native-permissions";
|
|
5
5
|
import {PermissionKind, PermissionStatus} from "./Common";
|
|
6
6
|
|
|
7
|
-
export async function requestPermissions(
|
|
8
|
-
return new Promise(
|
|
7
|
+
export async function requestPermissions(_kind: PermissionKind): Promise<PermissionStatus> {
|
|
8
|
+
return new Promise((_resolve, _reject) => {
|
|
9
9
|
return "denied";
|
|
10
10
|
});
|
|
11
11
|
// const userPropertyKey = `PermissionsFor${capitalize(kind)}`;
|
package/src/PickerSelect.tsx
CHANGED
|
@@ -201,7 +201,7 @@ export function RNPickerSelect({
|
|
|
201
201
|
Keyboard.dismiss();
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
-
setAnimationType(modalProps
|
|
204
|
+
setAnimationType(modalProps?.animationType ? modalProps?.animationType : "slide");
|
|
205
205
|
|
|
206
206
|
triggerOpenCloseCallbacks();
|
|
207
207
|
|
package/src/SectionDivider.tsx
CHANGED
package/src/SegmentedControl.tsx
CHANGED
|
@@ -24,7 +24,9 @@ export const SegmentedControl: FC<SegmentedControlProps> = ({
|
|
|
24
24
|
}, []);
|
|
25
25
|
|
|
26
26
|
const handleNext = useCallback(() => {
|
|
27
|
-
setStartIndex((prev) =>
|
|
27
|
+
setStartIndex((prev) =>
|
|
28
|
+
Math.min(items.length - (maxItems ?? items.length), prev + (maxItems ?? 4))
|
|
29
|
+
);
|
|
28
30
|
}, [items.length, maxItems]);
|
|
29
31
|
|
|
30
32
|
const visibleItems = maxItems ? items.slice(startIndex, startIndex + maxItems) : items;
|
package/src/Signature.native.tsx
CHANGED
|
@@ -21,14 +21,14 @@ export const Signature: FC<Props> = ({onChange, onStart, onEnd}: Props) => {
|
|
|
21
21
|
};
|
|
22
22
|
|
|
23
23
|
const onBegin = () => {
|
|
24
|
-
onStart
|
|
24
|
+
onStart?.();
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
// Called after end of stroke. Kind of goofy if you ask me,
|
|
28
28
|
// but you need this in order to trigger the 'onOK' callback that gives us the actual image.
|
|
29
29
|
const handleEnd = () => {
|
|
30
30
|
ref.current?.readSignature();
|
|
31
|
-
onEnd
|
|
31
|
+
onEnd?.();
|
|
32
32
|
};
|
|
33
33
|
|
|
34
34
|
return (
|
package/src/SignatureField.tsx
CHANGED
package/src/Slider.tsx
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import SliderComponent from "@react-native-community/slider";
|
|
2
2
|
import React, {FC} from "react";
|
|
3
|
-
import {View} from "react-native";
|
|
4
3
|
|
|
5
4
|
import {Box} from "./Box";
|
|
6
5
|
import {IconName, SliderProps, ValueMappingItem} from "./Common";
|
|
@@ -16,11 +15,11 @@ const getCurrentMapping = (map: ValueMappingItem[], value: number) => {
|
|
|
16
15
|
if (!map || map.length === 0) {
|
|
17
16
|
return null;
|
|
18
17
|
}
|
|
19
|
-
|
|
18
|
+
|
|
20
19
|
// Find the option with the closest value
|
|
21
20
|
let closestOption = map[0];
|
|
22
21
|
let closestDistance = Math.abs(value - closestOption.value);
|
|
23
|
-
|
|
22
|
+
|
|
24
23
|
for (const option of map) {
|
|
25
24
|
const distance = Math.abs(value - option.value);
|
|
26
25
|
if (distance < closestDistance) {
|
|
@@ -28,7 +27,7 @@ const getCurrentMapping = (map: ValueMappingItem[], value: number) => {
|
|
|
28
27
|
closestOption = option;
|
|
29
28
|
}
|
|
30
29
|
}
|
|
31
|
-
|
|
30
|
+
|
|
32
31
|
return closestOption;
|
|
33
32
|
};
|
|
34
33
|
|
|
@@ -49,9 +48,9 @@ const getCenterContent = (
|
|
|
49
48
|
</Text>
|
|
50
49
|
);
|
|
51
50
|
}
|
|
52
|
-
|
|
51
|
+
|
|
53
52
|
const currentOption = getCurrentMapping(valueMapping, value);
|
|
54
|
-
|
|
53
|
+
|
|
55
54
|
if (useIcons) {
|
|
56
55
|
return (
|
|
57
56
|
<Icon
|
|
@@ -61,7 +60,7 @@ const getCenterContent = (
|
|
|
61
60
|
/>
|
|
62
61
|
);
|
|
63
62
|
}
|
|
64
|
-
|
|
63
|
+
|
|
65
64
|
return (
|
|
66
65
|
<Text align="center" color={disabled ? "secondaryLight" : "primary"} size="2xl">
|
|
67
66
|
{currentOption?.label}
|
|
@@ -72,7 +71,7 @@ const getCenterContent = (
|
|
|
72
71
|
const getSliderContent = (
|
|
73
72
|
slider: React.ReactElement,
|
|
74
73
|
inlineLabels: boolean,
|
|
75
|
-
labels?: SliderProps[
|
|
74
|
+
labels?: SliderProps["labels"]
|
|
76
75
|
): React.ReactElement => {
|
|
77
76
|
if (inlineLabels && labels?.min && labels?.max) {
|
|
78
77
|
return (
|
|
@@ -154,9 +153,9 @@ export const Slider: FC<SliderProps> = ({
|
|
|
154
153
|
thumbStyle: {
|
|
155
154
|
width: 48,
|
|
156
155
|
height: 48,
|
|
157
|
-
backgroundColor:
|
|
156
|
+
backgroundColor: "white",
|
|
158
157
|
borderRadius: 24,
|
|
159
|
-
shadowColor:
|
|
158
|
+
shadowColor: "#000",
|
|
160
159
|
shadowOffset: {
|
|
161
160
|
width: 0,
|
|
162
161
|
height: 2,
|
|
@@ -189,11 +188,7 @@ export const Slider: FC<SliderProps> = ({
|
|
|
189
188
|
<Box>
|
|
190
189
|
{Boolean(title) && <FieldTitle text={title!} />}
|
|
191
190
|
<Box direction="column" gap={showSelection ? 2 : 0}>
|
|
192
|
-
{showSelection &&
|
|
193
|
-
<Box alignItems="center">
|
|
194
|
-
{centerContent}
|
|
195
|
-
</Box>
|
|
196
|
-
)}
|
|
191
|
+
{showSelection && <Box alignItems="center">{centerContent}</Box>}
|
|
197
192
|
{sliderContent}
|
|
198
193
|
</Box>
|
|
199
194
|
{Boolean(helperText && !errorText) && <FieldHelperText text={helperText!} />}
|
|
@@ -201,5 +196,3 @@ export const Slider: FC<SliderProps> = ({
|
|
|
201
196
|
</Box>
|
|
202
197
|
);
|
|
203
198
|
};
|
|
204
|
-
|
|
205
|
-
|
package/src/SplitPage.native.tsx
CHANGED
|
@@ -9,7 +9,6 @@ import {SplitPageProps} from "./Common";
|
|
|
9
9
|
import {FlatList} from "./FlatList";
|
|
10
10
|
import {IconButton} from "./IconButton";
|
|
11
11
|
import {Spinner} from "./Spinner";
|
|
12
|
-
import {useTheme} from "./Theme";
|
|
13
12
|
import {Unifier} from "./Unifier";
|
|
14
13
|
|
|
15
14
|
export const SplitPage = ({
|
|
@@ -26,7 +25,6 @@ export const SplitPage = ({
|
|
|
26
25
|
bottomNavBarHeight,
|
|
27
26
|
showItemList,
|
|
28
27
|
}: SplitPageProps) => {
|
|
29
|
-
const {theme} = useTheme();
|
|
30
28
|
const [selectedId, setSelectedId] = useState<number | undefined>(undefined);
|
|
31
29
|
|
|
32
30
|
// flattenChildren is necessary to pull children from a React Fragment. Without this,
|
|
@@ -92,7 +90,7 @@ export const SplitPage = ({
|
|
|
92
90
|
paddingBottom: bottomNavBarHeight,
|
|
93
91
|
}}
|
|
94
92
|
>
|
|
95
|
-
{renderListViewHeader
|
|
93
|
+
{renderListViewHeader?.()}
|
|
96
94
|
<FlatList
|
|
97
95
|
data={listViewData}
|
|
98
96
|
extraData={listViewExtraData}
|
|
@@ -117,7 +115,7 @@ export const SplitPage = ({
|
|
|
117
115
|
onClick={() => onItemDeselect()}
|
|
118
116
|
/>
|
|
119
117
|
</Box>
|
|
120
|
-
{renderContent
|
|
118
|
+
{renderContent?.(selectedId)}
|
|
121
119
|
</Box>
|
|
122
120
|
);
|
|
123
121
|
};
|
package/src/SplitPage.tsx
CHANGED
|
@@ -95,7 +95,7 @@ export const SplitPage = ({
|
|
|
95
95
|
flexDirection: "column",
|
|
96
96
|
}}
|
|
97
97
|
>
|
|
98
|
-
{renderListViewHeader
|
|
98
|
+
{renderListViewHeader?.()}
|
|
99
99
|
<FlatList
|
|
100
100
|
data={listViewData}
|
|
101
101
|
extraData={listViewExtraData}
|
|
@@ -109,7 +109,7 @@ export const SplitPage = ({
|
|
|
109
109
|
const renderListContent = () => {
|
|
110
110
|
return (
|
|
111
111
|
<Box flex="grow" padding={2}>
|
|
112
|
-
{renderContent
|
|
112
|
+
{renderContent?.(selectedId)}
|
|
113
113
|
</Box>
|
|
114
114
|
);
|
|
115
115
|
};
|
|
@@ -205,7 +205,7 @@ export const SplitPage = ({
|
|
|
205
205
|
flexDirection: "column",
|
|
206
206
|
}}
|
|
207
207
|
>
|
|
208
|
-
{renderListViewHeader
|
|
208
|
+
{renderListViewHeader?.()}
|
|
209
209
|
<FlatList
|
|
210
210
|
data={listViewData}
|
|
211
211
|
extraData={listViewExtraData}
|
|
@@ -234,7 +234,7 @@ export const SplitPage = ({
|
|
|
234
234
|
/>
|
|
235
235
|
</Box>
|
|
236
236
|
)}
|
|
237
|
-
{renderContent
|
|
237
|
+
{renderContent?.(selectedId)}
|
|
238
238
|
</Box>
|
|
239
239
|
);
|
|
240
240
|
};
|
package/src/TapToEdit.tsx
CHANGED
|
@@ -13,11 +13,7 @@ const TapToEditTitle: FC<{
|
|
|
13
13
|
onlyShowHelperTextWhileEditing?: boolean;
|
|
14
14
|
title: string;
|
|
15
15
|
helperText?: string;
|
|
16
|
-
}> = ({
|
|
17
|
-
title,
|
|
18
|
-
helperText,
|
|
19
|
-
onlyShowHelperTextWhileEditing,
|
|
20
|
-
}) => {
|
|
16
|
+
}> = ({title, helperText, onlyShowHelperTextWhileEditing}) => {
|
|
21
17
|
return (
|
|
22
18
|
<View style={{flex: 1, justifyContent: "center"}}>
|
|
23
19
|
<Text bold>{title}</Text>
|
|
@@ -117,7 +113,7 @@ export const TapToEdit: FC<TapToEditProps> = ({
|
|
|
117
113
|
</View>
|
|
118
114
|
<View style={{gap: 16}}>
|
|
119
115
|
<Field
|
|
120
|
-
grow={fieldProps?.type === "textarea" ? fieldProps.grow ?? true : undefined}
|
|
116
|
+
grow={fieldProps?.type === "textarea" ? (fieldProps.grow ?? true) : undefined}
|
|
121
117
|
helperText={helperText}
|
|
122
118
|
inputRef={
|
|
123
119
|
["text", "textarea", "url", "email", "number"].includes(fieldProps?.type)
|
|
@@ -210,7 +206,7 @@ export const TapToEdit: FC<TapToEditProps> = ({
|
|
|
210
206
|
try {
|
|
211
207
|
const url = new URL(value);
|
|
212
208
|
displayValue = url?.hostname ?? value;
|
|
213
|
-
} catch (
|
|
209
|
+
} catch (_error) {
|
|
214
210
|
// Don't print an error message for empty values.
|
|
215
211
|
if (value) {
|
|
216
212
|
console.debug(`Invalid URL: $value`);
|