Skip to content

Commit 1507624

Browse files
committed
Merge branch 'master' of https://github.com/jaredh159/tailwind-react-native-classnames into @simek/feat-support-outline-styles
# Conflicts: # src/UtilityParser.ts
2 parents 66d8090 + 7a60aff commit 1507624

4 files changed

Lines changed: 10 additions & 4 deletions

File tree

changelog.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project ad
1010

1111
### Added
1212

13-
- Add missing for `contents` value for `display` utility (thanks @Simek)
14-
[(#373)](https://github.com/jaredh159/tailwind-react-native-classnames/pull/373).
15-
- Add support for `boxSizing` utilities (thanks @Simek)
13+
- Add missing `contents` value for `display` utility (thanks @Simek)
1614
[(#372)](https://github.com/jaredh159/tailwind-react-native-classnames/pull/372).
15+
- Add support for `boxSizing` utilities (thanks @Simek)
16+
[(#371)](https://github.com/jaredh159/tailwind-react-native-classnames/pull/371).
1717

1818
## [4.13.0] - 2025-12-16
1919

src/UtilityParser.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export default class UtilityParser {
376376
if (style) return style;
377377
}
378378

379-
h.warn(`\`${this.rest}\` unknown or invalid utility`);
379+
h.warn(`\`${this.isNegative ? `-` : ``}${this.rest}\` unknown or invalid utility`);
380380
return null;
381381
}
382382

src/__tests__/simple-mappings.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ describe(`simple style mappings`, () => {
9292
[`align-bottom`, { verticalAlign: `bottom` }],
9393
[`align-middle`, { verticalAlign: `middle` }],
9494

95+
[`cursor-auto`, { cursor: `auto` }],
96+
[`cursor-pointer`, { cursor: `pointer` }],
97+
9598
[`box-border`, { boxSizing: `border-box` }],
9699
[`box-content`, { boxSizing: `content-box` }],
97100

src/styles.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ const defaultStyles: Array<[string, StyleIR]> = [
115115
[`align-bottom`, complete({ verticalAlign: `bottom` })],
116116
[`align-middle`, complete({ verticalAlign: `middle` })],
117117

118+
[`cursor-auto`, complete({ cursor: `auto` })],
119+
[`cursor-pointer`, complete({ cursor: `pointer` })],
120+
118121
[`box-border`, complete({ boxSizing: `border-box` })],
119122
[`box-content`, complete({ boxSizing: `content-box` })],
120123

0 commit comments

Comments
 (0)