nitro-web 0.0.46 → 0.0.47
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/accordion.tsx +28 -16
- package/components/partials/element/button.tsx +4 -4
- package/components/partials/form/field-currency.tsx +1 -1
- package/components/partials/form/field-date.tsx +3 -1
- package/components/partials/form/field.tsx +5 -6
- package/components/partials/form/select.tsx +5 -5
- package/package.json +1 -1
- package/types/util.d.ts +6 -0
- package/types/util.d.ts.map +1 -1
- package/util.js +21 -0
|
@@ -3,21 +3,16 @@ import { css } from 'twin.macro'
|
|
|
3
3
|
import { IsFirstRender } from 'nitro-web'
|
|
4
4
|
|
|
5
5
|
type AccordionProps = {
|
|
6
|
-
|
|
6
|
+
ariaControls?: string // pass to add aria-controls attribute to the accordion
|
|
7
|
+
children: React.ReactNode // first child is the header, second child is the contents
|
|
7
8
|
className?: string
|
|
8
|
-
|
|
9
|
-
|
|
9
|
+
classNameWhenExpanded?: string // handy for group styling
|
|
10
|
+
expanded?: boolean // initial value (or controlled value if onChange is passed)
|
|
11
|
+
onChange?: (event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>, index: number) => void
|
|
12
|
+
// called when the header is clicked
|
|
10
13
|
}
|
|
11
14
|
|
|
12
|
-
export function Accordion({ children, className, expanded, onChange }: AccordionProps) {
|
|
13
|
-
/**
|
|
14
|
-
* @param {rxjs} children - first child is the header, second child is the contents
|
|
15
|
-
* <Accordion>
|
|
16
|
-
* <div>Header</div><div>Contents</div>
|
|
17
|
-
* </Accordion>
|
|
18
|
-
* @param {boolean} <expanded> - initial value (or controlled value if onChange is passed)
|
|
19
|
-
* @param {function} <onChange> - called when the header is clicked
|
|
20
|
-
*/
|
|
15
|
+
export function Accordion({ ariaControls, children, className, classNameWhenExpanded, expanded, onChange }: AccordionProps) {
|
|
21
16
|
const [preState, setPreState] = useState(expanded)
|
|
22
17
|
const [state, setState] = useState(expanded)
|
|
23
18
|
const [height, setHeight] = useState('auto')
|
|
@@ -28,9 +23,17 @@ export function Accordion({ children, className, expanded, onChange }: Accordion
|
|
|
28
23
|
height: 0;
|
|
29
24
|
overflow: hidden;
|
|
30
25
|
transition: height ease 0.2s;
|
|
26
|
+
a, button {
|
|
27
|
+
visibility: hidden; /* removes from tab order */
|
|
28
|
+
transition: visibility 0s 0.2s;
|
|
29
|
+
}
|
|
31
30
|
}
|
|
32
|
-
&.is-expanded >
|
|
31
|
+
&.is-expanded > *:last-child {
|
|
33
32
|
height: ${height.replace('-', '')};
|
|
33
|
+
a, button {
|
|
34
|
+
visibility: visible;
|
|
35
|
+
transition: visibility 0s;
|
|
36
|
+
}
|
|
34
37
|
}
|
|
35
38
|
`
|
|
36
39
|
|
|
@@ -60,9 +63,9 @@ export function Accordion({ children, className, expanded, onChange }: Accordion
|
|
|
60
63
|
return () => timeout && clearTimeout(timeout)
|
|
61
64
|
}, [height])
|
|
62
65
|
|
|
63
|
-
const onClick = function(e: React.MouseEvent<HTMLDivElement>) {
|
|
66
|
+
const onClick = function(e: React.MouseEvent<HTMLDivElement>|React.KeyboardEvent<HTMLDivElement>) {
|
|
64
67
|
// Click came from inside the accordion header/summary
|
|
65
|
-
if (e.currentTarget.children[0].contains(e.target as
|
|
68
|
+
if (e.currentTarget.children[0].contains(e.target as HTMLElement) || e.currentTarget.children[0] == e.target) {
|
|
66
69
|
if (onChange) {
|
|
67
70
|
onChange(e, getElementIndex(e.currentTarget))
|
|
68
71
|
} else {
|
|
@@ -77,11 +80,20 @@ export function Accordion({ children, className, expanded, onChange }: Accordion
|
|
|
77
80
|
return index
|
|
78
81
|
}
|
|
79
82
|
|
|
83
|
+
const onKeyDown = function(e: React.KeyboardEvent<HTMLDivElement>) {
|
|
84
|
+
if (e.key === 'Enter' || e.key === ' ') {
|
|
85
|
+
onClick(e)
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
80
89
|
return (
|
|
81
90
|
<div
|
|
82
91
|
ref={el}
|
|
83
|
-
|
|
92
|
+
aria-controls={ariaControls}
|
|
93
|
+
aria-expanded={ariaControls ? state : undefined}
|
|
94
|
+
class={['accordion', className, state ? `is-expanded ${classNameWhenExpanded}` : '', 'nitro-accordion'].filter(o => o).join(' ')}
|
|
84
95
|
onClick={onClick}
|
|
96
|
+
onKeyDown={onKeyDown}
|
|
85
97
|
css={style}
|
|
86
98
|
>
|
|
87
99
|
{children}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { twMerge } from '
|
|
1
|
+
import { twMerge } from 'nitro-web'
|
|
2
2
|
import { ChevronDown, ChevronUp } from 'lucide-react'
|
|
3
3
|
|
|
4
4
|
type Button = React.ButtonHTMLAttributes<HTMLButtonElement> & {
|
|
@@ -42,9 +42,9 @@ export function Button({
|
|
|
42
42
|
// Button sizes
|
|
43
43
|
const sizes = {
|
|
44
44
|
xs: 'px-2 py-1 px-button-x-xs py-button-y-xs text-xs rounded',
|
|
45
|
-
sm: 'px-2.5 py-1.5 px-button-x-sm py-button-y-sm text-sm rounded-md',
|
|
46
|
-
md: 'px-3 py-
|
|
47
|
-
lg: 'px-3.5 py-2.5 px-button-x-lg py-button-y-lg text-sm rounded-md',
|
|
45
|
+
sm: 'px-2.5 py-1.5 px-button-x-sm py-button-y-sm text-sm text-sm-button rounded-md',
|
|
46
|
+
md: 'px-3 py-[0.58rem] px-button-x-md py-button-y-md text-sm text-sm-button rounded-md', // default
|
|
47
|
+
lg: 'px-3.5 py-2.5 px-button-x-lg py-button-y-lg text-sm text-sm-button rounded-md',
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
const contentLayout = `gap-x-1.5 ${iconPosition == 'none' ? '' : 'inline-flex items-center justify-center'}`
|
|
@@ -148,7 +148,7 @@ export function FieldCurrency({ config, currency='nzd', onChange, value, default
|
|
|
148
148
|
defaultValue={defaultValue}
|
|
149
149
|
/>
|
|
150
150
|
<span
|
|
151
|
-
class={`absolute top-
|
|
151
|
+
class={`absolute top-0 bottom-0 left-3 inline-flex items-center select-none text-gray-500 text-sm text-sm-input ${dollars !== null && settings.prefix == '$' ? 'text-foreground' : ''}`}
|
|
152
152
|
>
|
|
153
153
|
{settings.prefix || settings.suffix}
|
|
154
154
|
</span>
|
|
@@ -121,7 +121,9 @@ export function FieldDate({
|
|
|
121
121
|
{
|
|
122
122
|
prefix &&
|
|
123
123
|
// Similar classNames to the input.tsx:IconWrapper()
|
|
124
|
-
<span className="
|
|
124
|
+
<span className="z-[0] col-start-1 row-start-1 self-center select-none justify-self-start text-sm text-sm-input ml-3">
|
|
125
|
+
{prefix}
|
|
126
|
+
</span>
|
|
125
127
|
}
|
|
126
128
|
<input
|
|
127
129
|
{...props}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { css } from 'twin.macro'
|
|
3
|
-
import { twMerge } from 'tailwind-merge'
|
|
4
3
|
import { util, FieldCurrency, FieldCurrencyProps, FieldColor, FieldColorProps, FieldDate, FieldDateProps } from 'nitro-web'
|
|
5
4
|
import { Errors, type Error } from 'nitro-web/types'
|
|
6
5
|
import {
|
|
@@ -141,11 +140,11 @@ function FieldContainer({ children, className, error }: { children: React.ReactN
|
|
|
141
140
|
function getInputClasses({ error, Icon, iconPos, type }: { error: Error, Icon?: React.ReactNode, iconPos: string, type?: string }) {
|
|
142
141
|
const pl = 'pl-3 pl-input-x'
|
|
143
142
|
const pr = 'pr-3 pr-input-x'
|
|
144
|
-
const py = 'py-
|
|
143
|
+
const py = 'py-[0.58rem] py-input-y'
|
|
145
144
|
const plWithIcon = type == 'color' ? 'pl-9' : 'pl-8' // was sm:pl-8 pl-8, etc
|
|
146
145
|
const prWithIcon = type == 'color' ? 'pr-9' : 'pr-8'
|
|
147
146
|
return (
|
|
148
|
-
`block ${py} col-start-1 row-start-1 w-full rounded-md bg-white text-sm
|
|
147
|
+
`block ${py} col-start-1 row-start-1 w-full rounded-md bg-white text-sm text-sm-input outline outline-1 -outline-offset-1 ` +
|
|
149
148
|
'placeholder:text-input-placeholder focus:outline focus:outline-2 focus:-outline-offset-2 ' +
|
|
150
149
|
(iconPos == 'right' && Icon ? `${pl} ${prWithIcon} ` : (Icon ? `${plWithIcon} ${pr} ` : `${pl} ${pr} `)) +
|
|
151
150
|
(error
|
|
@@ -161,11 +160,11 @@ function IconWrapper({ icon, iconPos, ...props }: IconWrapperProps) {
|
|
|
161
160
|
!!icon &&
|
|
162
161
|
<div
|
|
163
162
|
{...props}
|
|
164
|
-
className={
|
|
165
|
-
'
|
|
163
|
+
className={
|
|
164
|
+
'z-[0] size-[14px] col-start-1 row-start-1 self-center text-[#c6c8ce] select-none ' +
|
|
166
165
|
(iconPos == 'right' ? 'justify-self-end mr-3 ' : 'justify-self-start ml-3 ') +
|
|
167
166
|
props.className || ''
|
|
168
|
-
|
|
167
|
+
}
|
|
169
168
|
>{icon}</div>
|
|
170
169
|
)
|
|
171
170
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { css } from 'twin.macro'
|
|
2
|
-
import { twMerge } from '
|
|
2
|
+
import { twMerge } from 'nitro-web'
|
|
3
3
|
import ReactSelect, { components, ControlProps, createFilter, OptionProps, SingleValueProps } from 'react-select'
|
|
4
4
|
import { ClearIndicatorProps, DropdownIndicatorProps, MultiValueRemoveProps } from 'react-select'
|
|
5
5
|
import { ChevronUpDownIcon, CheckCircleIcon, XMarkIcon } from '@heroicons/react/20/solid'
|
|
@@ -237,11 +237,11 @@ const selectStyles = {
|
|
|
237
237
|
// Based off https://www.jussivirtanen.fi/writing/styling-react-select-with-tailwind
|
|
238
238
|
// Input container
|
|
239
239
|
control: {
|
|
240
|
-
base: 'rounded-md bg-white hover:cursor-pointer text-sm
|
|
240
|
+
base: 'rounded-md bg-white hover:cursor-pointer text-sm text-sm-input outline outline-1 -outline-offset-1 outline-input-border',
|
|
241
241
|
focus: 'outline-2 -outline-offset-2 outline-input-border-focus',
|
|
242
242
|
error: 'outline-danger',
|
|
243
243
|
},
|
|
244
|
-
valueContainer: 'py-
|
|
244
|
+
valueContainer: 'py-[0.58rem] px-3 py-input-y px-input-x gap-1',
|
|
245
245
|
// Input container objects
|
|
246
246
|
input: {
|
|
247
247
|
base: 'text-input',
|
|
@@ -261,8 +261,8 @@ const selectStyles = {
|
|
|
261
261
|
indicatorsContainer: 'p-1 px-2 gap-1',
|
|
262
262
|
indicatorSeparator: 'py-0.5 before:content-[""] before:block before:bg-gray-100 before:w-px before:h-full',
|
|
263
263
|
// Dropdown menu
|
|
264
|
-
menu: 'mt-1.5 border border-dropdown-ul-border bg-white rounded-md text-sm overflow-hidden shadow-dropdown-ul',
|
|
265
|
-
groupHeading: 'ml-3 mt-2 mb-1 text-gray-500 text-sm',
|
|
264
|
+
menu: 'mt-1.5 border border-dropdown-ul-border bg-white rounded-md text-sm text-sm-input overflow-hidden shadow-dropdown-ul',
|
|
265
|
+
groupHeading: 'ml-3 mt-2 mb-1 text-gray-500 text-sm text-sm-input',
|
|
266
266
|
noOptionsMessage: 'm-1 text-gray-500 p-2 bg-gray-50 border border-dashed border-gray-200 rounded-sm',
|
|
267
267
|
option: {
|
|
268
268
|
base: 'relative px-3 py-2 !flex items-center gap-2 cursor-default',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nitro-web",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.47",
|
|
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
|
@@ -622,6 +622,12 @@ export function toArray<T>(variable: T | undefined): (T extends any[] ? T : T[])
|
|
|
622
622
|
* @returns {string}
|
|
623
623
|
*/
|
|
624
624
|
export function trim(string: string): string;
|
|
625
|
+
/**
|
|
626
|
+
* Merge tailwind classes, but ignore classes that shouldn't be merged, and intended as an override
|
|
627
|
+
* @param {...string} args
|
|
628
|
+
* @returns {string}
|
|
629
|
+
*/
|
|
630
|
+
export function twMerge(...args: string[]): string;
|
|
625
631
|
/**
|
|
626
632
|
* Capitalize the first letter of a string
|
|
627
633
|
* @param {string} string
|
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
|
@@ -2,6 +2,7 @@ import _axios from 'axios'
|
|
|
2
2
|
import axiosRetry from 'axios-retry'
|
|
3
3
|
import dateformat from 'dateformat'
|
|
4
4
|
import { loadStripe } from '@stripe/stripe-js/pure.js' // pure removes ping
|
|
5
|
+
import { twMerge as _twMerge } from 'tailwind-merge'
|
|
5
6
|
|
|
6
7
|
/** @type {{[key: string]: {[key: string]: string|true}}} */
|
|
7
8
|
let queryObjectCache = {}
|
|
@@ -1540,6 +1541,26 @@ export function trim (string) {
|
|
|
1540
1541
|
return string.trim().replace(/\n\s+\n/g, '\n\n')
|
|
1541
1542
|
}
|
|
1542
1543
|
|
|
1544
|
+
/**
|
|
1545
|
+
* Merge tailwind classes, but ignore classes that shouldn't be merged, and intended as an override
|
|
1546
|
+
* @param {...string} args
|
|
1547
|
+
* @returns {string}
|
|
1548
|
+
*/
|
|
1549
|
+
export function twMerge(...args) {
|
|
1550
|
+
const ignoredClasses = /** @type {string[]} */([])
|
|
1551
|
+
const ignoreClasses = ['text-sm-button', 'text-sm-input']
|
|
1552
|
+
const classes = args.filter(Boolean).join(' ').split(' ')
|
|
1553
|
+
|
|
1554
|
+
const filteredClasses = classes.filter(c => {
|
|
1555
|
+
if (ignoreClasses.includes(c)) {
|
|
1556
|
+
ignoredClasses.push(c)
|
|
1557
|
+
return false
|
|
1558
|
+
}
|
|
1559
|
+
return true
|
|
1560
|
+
})
|
|
1561
|
+
return _twMerge(...filteredClasses) + ' ' + ignoredClasses.join(' ')
|
|
1562
|
+
}
|
|
1563
|
+
|
|
1543
1564
|
/**
|
|
1544
1565
|
* Capitalize the first letter of a string
|
|
1545
1566
|
* @param {string} string
|