nitro-web 0.0.159 → 0.0.161
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/components/partials/element/timepicker.tsx +29 -25
- package/components/partials/form/field-date.tsx +15 -5
- package/package.json +1 -1
- package/types/util.d.ts +5 -1
- package/types/util.d.ts.map +1 -1
- package/util.js +29 -11
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useRef, useMemo, useEffect } from 'react'
|
|
2
2
|
import { isValid, format } from 'date-fns'
|
|
3
3
|
import { TZDate } from '@date-fns/tz'
|
|
4
|
-
import { twMerge } from 'nitro-web'
|
|
4
|
+
import { twMerge, date } from 'nitro-web'
|
|
5
5
|
import { dayButtonClassName } from '../element/calendar'
|
|
6
6
|
|
|
7
7
|
type Timestamp = null | number
|
|
@@ -10,12 +10,14 @@ export type TimePickerProps = {
|
|
|
10
10
|
onChange?: (value: Timestamp) => void
|
|
11
11
|
tz?: string
|
|
12
12
|
value?: Timestamp
|
|
13
|
-
|
|
13
|
+
// eslint-disable-next-line max-len
|
|
14
|
+
/** "Reactive" reference timestamp to copy the date from. Precedence order: `referenceTimestamp`, `value`, or today. Warning: This value needs to be updated after, or at the same time as `value`, otherwise the useffect will use the previous `value` */
|
|
14
15
|
referenceTimestamp?: Timestamp
|
|
16
|
+
/** Data for testing */
|
|
17
|
+
// _data?: { name: unknown }
|
|
15
18
|
}
|
|
16
19
|
|
|
17
20
|
export function TimePicker({ value, onChange, className, tz, referenceTimestamp }: TimePickerProps) {
|
|
18
|
-
const [internallyChanged, setInternallyChanged] = useState<Timestamp>()
|
|
19
21
|
const refs = {
|
|
20
22
|
hour: useRef<HTMLDivElement>(null),
|
|
21
23
|
minute: useRef<HTMLDivElement>(null),
|
|
@@ -34,31 +36,33 @@ export function TimePicker({ value, onChange, className, tz, referenceTimestamp
|
|
|
34
36
|
// Convert the value to an valid* date
|
|
35
37
|
const internalValue = useMemo(() => {
|
|
36
38
|
if (!value || !isValid(value)) return undefined
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
// Carry over the date from the referenceTimestamp, if provided
|
|
40
|
-
if (referenceTimestamp && isValid(referenceTimestamp)) {
|
|
41
|
-
const referenceDate = new TZDate(referenceTimestamp, tz)
|
|
42
|
-
const originalTime = date.getTime()
|
|
43
|
-
date.setDate(referenceDate.getDate())
|
|
44
|
-
date.setMonth(referenceDate.getMonth())
|
|
45
|
-
date.setFullYear(referenceDate.getFullYear())
|
|
46
|
-
// If the time has changed, update the value
|
|
47
|
-
if (originalTime !== date.getTime()) {
|
|
48
|
-
setInternallyChanged(date.getTime())
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
|
|
52
|
-
return date
|
|
39
|
+
const tzdate = new TZDate(value, tz)
|
|
40
|
+
return tzdate
|
|
53
41
|
}, [value, tz, referenceTimestamp])
|
|
54
42
|
|
|
55
|
-
//
|
|
43
|
+
// Carry over the date from the referenceTimestamp, if provided
|
|
56
44
|
useEffect(() => {
|
|
57
|
-
if (
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
45
|
+
if (!referenceTimestamp || !isValid(referenceTimestamp) || !internalValue) return
|
|
46
|
+
const referenceDate = new TZDate(referenceTimestamp, tz)
|
|
47
|
+
const newInternalValue = new TZDate(internalValue.getTime(), tz)
|
|
48
|
+
const [day, month, year] = [newInternalValue.getDate(), newInternalValue.getMonth(), newInternalValue.getFullYear()]
|
|
49
|
+
const [refDay, refMonth, refYear] = [referenceDate.getDate(), referenceDate.getMonth(), referenceDate.getFullYear()]
|
|
50
|
+
// const old = date(newInternalValue.getTime(), 'dd hh:mm aa', 'Pacific/Auckland')
|
|
51
|
+
|
|
52
|
+
if (day === refDay && month === refMonth && year === refYear) return
|
|
53
|
+
newInternalValue.setDate(refDay)
|
|
54
|
+
newInternalValue.setMonth(refMonth)
|
|
55
|
+
newInternalValue.setFullYear(refYear)
|
|
56
|
+
|
|
57
|
+
// if (_data && _data?.name === 'endTime') {
|
|
58
|
+
// console.log({
|
|
59
|
+
// old: old,
|
|
60
|
+
// new: date(newInternalValue.getTime(), 'dd hh:mm aa', 'Pacific/Auckland'),
|
|
61
|
+
// })
|
|
62
|
+
// }
|
|
63
|
+
|
|
64
|
+
onChange?.(newInternalValue?.getTime())
|
|
65
|
+
}, [referenceTimestamp])
|
|
62
66
|
|
|
63
67
|
// Get current values from date or use defaults
|
|
64
68
|
const hour = useMemo(() => internalValue ? parseInt(format(internalValue, 'h')) : undefined, [internalValue])
|
|
@@ -108,8 +108,7 @@ export function FieldDate({
|
|
|
108
108
|
switch (props.mode) {
|
|
109
109
|
case 'single':
|
|
110
110
|
case 'time': {
|
|
111
|
-
|
|
112
|
-
return [value && isValid(value) ? new Date(value).getTime() : null]
|
|
111
|
+
return [getStringValue(props.value, props.defaultValue)]
|
|
113
112
|
}
|
|
114
113
|
case 'multiple':
|
|
115
114
|
case 'range': {
|
|
@@ -127,6 +126,11 @@ export function FieldDate({
|
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
128
|
|
|
129
|
+
function getStringValue(value?: Timestamp, defaultValue?: Timestamp) {
|
|
130
|
+
const value2 = value ?? defaultValue
|
|
131
|
+
return value2 && isValid(value2) ? new Date(value2).getTime() : null
|
|
132
|
+
}
|
|
133
|
+
|
|
130
134
|
function getInputValue(value: Timestamp[]) {
|
|
131
135
|
return value.map(o => date(o, pattern, tz)).join(props.mode == 'range' ? ' - ' : ', ')
|
|
132
136
|
}
|
|
@@ -173,7 +177,7 @@ export function FieldDate({
|
|
|
173
177
|
function onNowClick() {
|
|
174
178
|
// Use the browser's local time and parse it into the timezone
|
|
175
179
|
const [hours, minutes, seconds] = [new Date().getHours(), new Date().getMinutes(), new Date().getSeconds()]
|
|
176
|
-
const nowInTz = parseDateString(`${hours}:${minutes}:${seconds}`, '
|
|
180
|
+
const nowInTz = parseDateString(`${hours}:${minutes}:${seconds}`, 'HH:mm:ss', tz)
|
|
177
181
|
onChange(nowInTz)
|
|
178
182
|
}
|
|
179
183
|
|
|
@@ -203,9 +207,15 @@ export function FieldDate({
|
|
|
203
207
|
}
|
|
204
208
|
{
|
|
205
209
|
(props.mode == 'time' || (!!showTime && props.mode == 'single')) &&
|
|
206
|
-
<TimePicker
|
|
210
|
+
<TimePicker
|
|
211
|
+
// The `value` needs to be updated before or at the same time as `referenceTimestamp`, otherwise the
|
|
212
|
+
// useffect in the timepicker will use the previous `value`
|
|
213
|
+
value={getStringValue(props.value, props.defaultValue)}
|
|
214
|
+
onChange={onChange<Timestamp>}
|
|
207
215
|
className={`border-l border-gray-100 ${props.mode == 'single' ? 'min-h-[0]' : ''}`}
|
|
208
|
-
referenceTimestamp={referenceTimestamp}
|
|
216
|
+
referenceTimestamp={referenceTimestamp}
|
|
217
|
+
tz={tz}
|
|
218
|
+
// _data={{ name: props.name }}
|
|
209
219
|
/>
|
|
210
220
|
}
|
|
211
221
|
</div>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nitro-web",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.161",
|
|
4
4
|
"repository": "github:boycce/nitro-web",
|
|
5
5
|
"homepage": "https://boycce.github.io/nitro-web/",
|
|
6
6
|
"description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",
|
package/types/util.d.ts
CHANGED
|
@@ -50,6 +50,8 @@ export function addressSchema(): {
|
|
|
50
50
|
};
|
|
51
51
|
/**
|
|
52
52
|
* Returns an axios instance for the client
|
|
53
|
+
* @param {object} [options] - Options for the axios instance
|
|
54
|
+
* @param {import('https').AgentOptions} [options.agentOptions={ keepAlive: true }] - Options for the https agent
|
|
53
55
|
* @returns {AxiosInstanceWithRetry}
|
|
54
56
|
*
|
|
55
57
|
* To set the defaults (e.g. baseURL) other than ones below, simply set them yourself:
|
|
@@ -58,7 +60,9 @@ export function addressSchema(): {
|
|
|
58
60
|
* axios().defaults.baseURL = 'https://example.com'
|
|
59
61
|
* ```
|
|
60
62
|
*/
|
|
61
|
-
export function axios(
|
|
63
|
+
export function axios({ agentOptions }?: {
|
|
64
|
+
agentOptions?: import("https").AgentOptions;
|
|
65
|
+
}): AxiosInstanceWithRetry;
|
|
62
66
|
/**
|
|
63
67
|
* Builds the url with params
|
|
64
68
|
* @param {string} url
|
package/types/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../util.js"],"names":[],"mappings":"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"}
|
package/util.js
CHANGED
|
@@ -46,6 +46,9 @@ let scrollbarCache
|
|
|
46
46
|
/** @type {boolean|undefined} */
|
|
47
47
|
let axiosNonce
|
|
48
48
|
|
|
49
|
+
/** @type {AxiosInstance|undefined} */
|
|
50
|
+
let axiosInstance
|
|
51
|
+
|
|
49
52
|
/**
|
|
50
53
|
* Returns a monastery schema which matches the Google autocomplete output
|
|
51
54
|
*/
|
|
@@ -84,6 +87,8 @@ export function addressSchema () {
|
|
|
84
87
|
|
|
85
88
|
/**
|
|
86
89
|
* Returns an axios instance for the client
|
|
90
|
+
* @param {object} [options] - Options for the axios instance
|
|
91
|
+
* @param {import('https').AgentOptions} [options.agentOptions={ keepAlive: true }] - Options for the https agent
|
|
87
92
|
* @returns {AxiosInstanceWithRetry}
|
|
88
93
|
*
|
|
89
94
|
* To set the defaults (e.g. baseURL) other than ones below, simply set them yourself:
|
|
@@ -92,18 +97,31 @@ export function addressSchema () {
|
|
|
92
97
|
* axios().defaults.baseURL = 'https://example.com'
|
|
93
98
|
* ```
|
|
94
99
|
*/
|
|
95
|
-
export function axios () {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
100
|
+
export function axios ({ agentOptions } = { agentOptions: { keepAlive: true } }) {
|
|
101
|
+
// On the client, add retries and set the baseURL
|
|
102
|
+
if (typeof window !== 'undefined') {
|
|
103
|
+
if (!axiosNonce) {
|
|
104
|
+
// Remove mobile specific protocol and subdomain
|
|
105
|
+
const clientOrigin = window.document.location.origin.replace(/^(capacitor|https):\/\/(mobile\.)?/, 'https://')
|
|
106
|
+
axiosNonce = true
|
|
107
|
+
_axios.defaults.baseURL = clientOrigin
|
|
108
|
+
_axios.defaults.headers.desktop = true
|
|
109
|
+
_axios.defaults.withCredentials = true
|
|
110
|
+
_axios.defaults.timeout = 60000
|
|
111
|
+
axiosRetry(_axios, { retries: 0, retryDelay: (/*i*/) => 300 })
|
|
112
|
+
}
|
|
113
|
+
return _axios
|
|
114
|
+
|
|
115
|
+
// On the server, reuse the existing axios instance to maintain keep-alive (for Azure SNAT Port Exhaustion, and speed up requests)
|
|
116
|
+
} else {
|
|
117
|
+
if (!axiosInstance) {
|
|
118
|
+
const https = require('https') // eslint-disable-line
|
|
119
|
+
axiosInstance = _axios.create({
|
|
120
|
+
httpsAgent: new https.Agent({ ...agentOptions }),
|
|
121
|
+
})
|
|
122
|
+
}
|
|
123
|
+
return axiosInstance
|
|
105
124
|
}
|
|
106
|
-
return _axios
|
|
107
125
|
}
|
|
108
126
|
|
|
109
127
|
/**
|