From 66fc8143dc4c43aa555b718b507c50f017b90b44 Mon Sep 17 00:00:00 2001 From: Andrew Berg Date: Fri, 6 Dec 2024 14:31:07 -0500 Subject: [PATCH 1/9] fix: safely escape strings passed to RegExp in InputSearch --- packages/kit/src/input-search/InputSearchListItem.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/kit/src/input-search/InputSearchListItem.tsx b/packages/kit/src/input-search/InputSearchListItem.tsx index 841a28139..31f73bff0 100644 --- a/packages/kit/src/input-search/InputSearchListItem.tsx +++ b/packages/kit/src/input-search/InputSearchListItem.tsx @@ -85,10 +85,15 @@ export const ListItem = ({ item, state }: ListItemProps) => { ); let highlighted; + + const escape = (string) => { + return string.replace(/[.*+\-?^${}()|[\]\\]/g, "\\$&"); + }; + if (typeof item.rendered === "string") { - highlighted = item.rendered.replace( - new RegExp((state as ComboBoxState).inputValue, "gi"), - (match) => (match ? `${match}` : "") + const val = escape((state as ComboBoxState).inputValue); + highlighted = item.rendered.replace(new RegExp(val, "gi"), (match) => + match ? `${match}` : "" ); } From 07b7bdc23eb7e05d1e80465bfba1fc2189d6f70b Mon Sep 17 00:00:00 2001 From: Andrew Berg Date: Fri, 6 Dec 2024 14:42:53 -0500 Subject: [PATCH 2/9] fix: allow props on InputSearch ListItem to pass through for custom styling --- packages/kit/src/input-search/InputSearchListItem.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/kit/src/input-search/InputSearchListItem.tsx b/packages/kit/src/input-search/InputSearchListItem.tsx index 31f73bff0..860064366 100644 --- a/packages/kit/src/input-search/InputSearchListItem.tsx +++ b/packages/kit/src/input-search/InputSearchListItem.tsx @@ -97,8 +97,11 @@ export const ListItem = ({ item, state }: ListItemProps) => { ); } + const { children, textValue, ...itemProps } = item.props; + return ( Date: Fri, 6 Dec 2024 15:28:54 -0500 Subject: [PATCH 3/9] chore: add lint ignore --- packages/kit/src/input-search/InputSearchListItem.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kit/src/input-search/InputSearchListItem.tsx b/packages/kit/src/input-search/InputSearchListItem.tsx index 860064366..e6c14d881 100644 --- a/packages/kit/src/input-search/InputSearchListItem.tsx +++ b/packages/kit/src/input-search/InputSearchListItem.tsx @@ -97,6 +97,7 @@ export const ListItem = ({ item, state }: ListItemProps) => { ); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars const { children, textValue, ...itemProps } = item.props; return ( From f874afd58dba13d242e2d38330b4d7ffe6d0ef5a Mon Sep 17 00:00:00 2001 From: Andrew Berg Date: Mon, 9 Dec 2024 10:30:44 -0500 Subject: [PATCH 4/9] fix: allow controlled InputSearch to be cleared by passing empty string --- .../kit/src/input-search/InputSearchInput.tsx | 15 +++- .../kit/src/input-search/play.stories.tsx | 71 ++++++++++++------- 2 files changed, 59 insertions(+), 27 deletions(-) diff --git a/packages/kit/src/input-search/InputSearchInput.tsx b/packages/kit/src/input-search/InputSearchInput.tsx index 97edc5e4e..0c8c9de10 100644 --- a/packages/kit/src/input-search/InputSearchInput.tsx +++ b/packages/kit/src/input-search/InputSearchInput.tsx @@ -62,13 +62,26 @@ export const InputSearchInput = React.forwardRef< } }, [state.selectionManager.focusedKey, setTempText]); - if (value) { + if (value !== undefined && value !== null) { inputProps.value = value; } + if (autocomplete && withKeyboard.current) { inputProps.value = tempText; } + const [, setRerender] = React.useState(false); + if (!inputProps.value && inputRef.current) { + const el = inputRef.current as HTMLInputElement; + if (el.value) { + // if a controlled input is passed an empty value, + // an extra render is needed to reset the input's internal state + requestAnimationFrame(() => { + setRerender((prev) => !prev); + }); + } + } + const handleKeyDown = (event: React.KeyboardEvent) => { if (event.key === "ArrowDown" || event.key === "ArrowUp") { withKeyboard.current = true; diff --git a/packages/kit/src/input-search/play.stories.tsx b/packages/kit/src/input-search/play.stories.tsx index e808b50a8..04bf49def 100644 --- a/packages/kit/src/input-search/play.stories.tsx +++ b/packages/kit/src/input-search/play.stories.tsx @@ -223,34 +223,44 @@ export const Scroll = { const ControlledTemplate: StoryFn = (args) => { const [term, setTerm] = useState(""); return ( - - { - setTerm(value); + <> + +
+ + { + setTerm(value); }} - /> - - - - - - - - - - - + > + { + setTerm(event.target.value); + }} + /> + + + + + + + + + + + + ); }; @@ -298,7 +308,7 @@ export const ControlledKeyboardInteractions = { play: async () => { const input = await screen.findByLabelText("Search"); - await userEvent.type(input, "app", { + await userEvent.type(input, "test", { delay: 100, }); await userEvent.keyboard("[ArrowDown]"); @@ -310,5 +320,14 @@ export const ControlledKeyboardInteractions = { const clearButton = await screen.findByText("Clear"); await userEvent.click(clearButton); await expect(input).toHaveDisplayValue(""); + await userEvent.type(input, "test", { + delay: 100, + }); + await userEvent.keyboard("[ArrowDown]"); + await expect(input).toHaveDisplayValue("Apple"); + const externalClearButton = await screen.findByText("External Clear"); + await userEvent.click(externalClearButton); + await expect(input).toHaveDisplayValue(""); + // }, }; From f4697d5087f37cdfb93f462295bb4531fb347fe3 Mon Sep 17 00:00:00 2001 From: Andrew Berg Date: Mon, 9 Dec 2024 14:58:45 -0500 Subject: [PATCH 5/9] fix: include onSelect callback in InputSelect selected documentation example --- .../docs/components/input-search.mdx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build.washingtonpost.com/docs/components/input-search.mdx b/build.washingtonpost.com/docs/components/input-search.mdx index 59ce89e3c..cd611441b 100644 --- a/build.washingtonpost.com/docs/components/input-search.mdx +++ b/build.washingtonpost.com/docs/components/input-search.mdx @@ -563,9 +563,18 @@ export default function Example() { const [term, setTerm] = useState(""); const results = searchCities(term); + const [selected, setSelected] = useState(""); + return ( - + + Selected value: {selected} + + setSelected(value)} + > Date: Tue, 10 Dec 2024 10:50:31 -0500 Subject: [PATCH 6/9] fix: honor disabled prop in InputSearch list item --- .../src/input-search/InputSearchListItem.tsx | 22 +++++++++++++-- .../kit/src/input-search/InputSearchRoot.tsx | 8 +++++- .../kit/src/input-search/play.stories.tsx | 28 +++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/packages/kit/src/input-search/InputSearchListItem.tsx b/packages/kit/src/input-search/InputSearchListItem.tsx index e6c14d881..9eec0f227 100644 --- a/packages/kit/src/input-search/InputSearchListItem.tsx +++ b/packages/kit/src/input-search/InputSearchListItem.tsx @@ -2,6 +2,7 @@ import React from "react"; import { Item } from "react-stately"; import { useOption } from "react-aria"; import { styled, theme } from "../theme"; +import { InputSearchContext } from "./InputSearchRoot"; import type { Node, ListState, ComboBoxState } from "react-stately"; @@ -75,6 +76,24 @@ interface ListItemProps { } export const ListItem = ({ item, state }: ListItemProps) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { children, textValue, disabled, ...itemProps } = item.props; + + const { setDisabledKeys } = React.useContext(InputSearchContext); + React.useEffect(() => { + if (disabled && !state.disabledKeys.has(item.key)) { + setDisabledKeys((prev) => { + if (prev) { + const next = new Set(prev); + next.add(item.key); + return next; + } else { + return new Set([item.key]); + } + }); + } + }, [disabled, setDisabledKeys, state.disabledKeys]); + const ref = React.useRef(null); const { optionProps, isDisabled, isSelected, isFocused } = useOption( { @@ -97,9 +116,6 @@ export const ListItem = ({ item, state }: ListItemProps) => { ); } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { children, textValue, ...itemProps } = item.props; - return ( | undefined> >; + setDisabledKeys: React.Dispatch< + React.SetStateAction | undefined> + >; isDisabled?: boolean; setUsePortal: React.Dispatch>; setPortalDomNode: React.Dispatch>; @@ -76,9 +79,11 @@ export const InputSearchRoot = ({ }: InputSearchRootProps) => { const [collectionChildren, setCollectionChildren] = React.useState>(); + const [disabledKeys, setDisabledKeys] = React.useState>(); const state = useComboBoxState({ children: collectionChildren, + disabledKeys, allowsCustomValue: true, allowsEmptyCollection: true, menuTrigger: openOnFocus ? "focus" : "input", @@ -132,6 +137,7 @@ export const InputSearchRoot = ({ inputProps, listBoxProps, setCollectionChildren, + setDisabledKeys, setUsePortal, setPortalDomNode, isDisabled: disabled, diff --git a/packages/kit/src/input-search/play.stories.tsx b/packages/kit/src/input-search/play.stories.tsx index 04bf49def..9aaf01f08 100644 --- a/packages/kit/src/input-search/play.stories.tsx +++ b/packages/kit/src/input-search/play.stories.tsx @@ -192,6 +192,34 @@ export const Grouping = { }, }; +const DisabledTemplate: StoryFn = (args) => { + return ( + + + + + + + + + + + + + + + ); +}; + +export const Disabled = { + render: DisabledTemplate, + args: {}, + + parameters: { + chromatic: { disableSnapshot: true }, + }, +}; + const ScrollTemplate: StoryFn = (args) => { return ( From b747baa8d147c575fba552ea8cab373b50434abe Mon Sep 17 00:00:00 2001 From: wp-aberg <102534985+wp-aberg@users.noreply.github.com> Date: Wed, 11 Dec 2024 11:26:28 -0500 Subject: [PATCH 7/9] fix: apply disabled text color to NavigationMenu trigger --- .../navigation-menu/NavigationMenuTrigger.tsx | 3 + .../kit/src/navigation-menu/play.stories.tsx | 56 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/packages/kit/src/navigation-menu/NavigationMenuTrigger.tsx b/packages/kit/src/navigation-menu/NavigationMenuTrigger.tsx index a63568dee..a821766e7 100644 --- a/packages/kit/src/navigation-menu/NavigationMenuTrigger.tsx +++ b/packages/kit/src/navigation-menu/NavigationMenuTrigger.tsx @@ -19,6 +19,9 @@ const StyledNavigationMenuTrigger = styled(NavigationMenuPrimitive.Trigger, { fontSize: theme.fontSizes["100"], lineHeight: theme.lineHeights.meta, padding: theme.space["050"], + "&:disabled": { + color: "$onDisabled", + }, }); export type NavigationMenuTriggerProps = { diff --git a/packages/kit/src/navigation-menu/play.stories.tsx b/packages/kit/src/navigation-menu/play.stories.tsx index 5d69eeaca..1a1ef92c2 100644 --- a/packages/kit/src/navigation-menu/play.stories.tsx +++ b/packages/kit/src/navigation-menu/play.stories.tsx @@ -272,6 +272,62 @@ export const Vertical = { render: VerticalTemplate, }; +const DisabledTemplate: StoryFn = (args) => { + return ( + + + + + House + + + + + Governors + + + + + Results By State + &": { + transform: "rotate(-180deg)", + }, + }} + > + + + + + + + + Alabama + + + Alaska + + + Arizona + + + + + + + + ); +}; + +export const Disabled = { + render: DisabledTemplate, +}; + // eslint-disable-next-line @typescript-eslint/no-explicit-any const InteractionsTemplate: StoryFn = () => ( From 8690322aa8bd22e196ac46a18563253f1dfbe994 Mon Sep 17 00:00:00 2001 From: site-eng-github-actions Date: Wed, 11 Dec 2024 16:56:09 +0000 Subject: [PATCH 8/9] chore(release): publish --- CHANGELOG.md | 14 ++++++++ apps/nextjs13-approuter/CHANGELOG.md | 4 +++ apps/nextjs13-approuter/package.json | 6 ++-- apps/nextjs13-pagerouter/CHANGELOG.md | 4 +++ apps/nextjs13-pagerouter/package.json | 6 ++-- apps/nextjs14-approuter/CHANGELOG.md | 4 +++ apps/nextjs14-approuter/package.json | 6 ++-- apps/nextjs14-pagerouter/CHANGELOG.md | 4 +++ apps/nextjs14-pagerouter/package.json | 6 ++-- build.washingtonpost.com/CHANGELOG.md | 10 ++++++ build.washingtonpost.com/package.json | 8 ++--- lerna.json | 2 +- package-lock.json | 50 +++++++++++++-------------- packages/eslint-plugin/CHANGELOG.md | 6 ++++ packages/eslint-plugin/package.json | 4 +-- packages/kit/CHANGELOG.md | 13 +++++++ packages/kit/package.json | 2 +- packages/kitchen-sink/CHANGELOG.md | 6 ++++ packages/kitchen-sink/package.json | 4 +-- packages/tailwind-theme/CHANGELOG.md | 6 ++++ packages/tailwind-theme/package.json | 4 +-- packages/tokens/CHANGELOG.md | 6 ++++ packages/tokens/package.json | 4 +-- 23 files changed, 128 insertions(+), 51 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f72b1a5f..636c5d753 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Bug Fixes + +- allow controlled InputSearch to be cleared by passing empty string ([f874afd](https://github.com/washingtonpost/wpds-ui-kit/commit/f874afd58dba13d242e2d38330b4d7ffe6d0ef5a)) +- allow props on InputSearch ListItem to pass through for custom styling ([07b7bdc](https://github.com/washingtonpost/wpds-ui-kit/commit/07b7bdc23eb7e05d1e80465bfba1fc2189d6f70b)) +- honor disabled prop in InputSearch list item ([62f88ec](https://github.com/washingtonpost/wpds-ui-kit/commit/62f88ecfd087f02e5373b89c36a59a367c9536bc)) +- include onSelect callback in InputSelect selected documentation example ([f4697d5](https://github.com/washingtonpost/wpds-ui-kit/commit/f4697d5087f37cdfb93f462295bb4531fb347fe3)) +- safely escape strings passed to RegExp in InputSearch ([66fc814](https://github.com/washingtonpost/wpds-ui-kit/commit/66fc8143dc4c43aa555b718b507c50f017b90b44)) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) ### Bug Fixes diff --git a/apps/nextjs13-approuter/CHANGELOG.md b/apps/nextjs13-approuter/CHANGELOG.md index bb8cf3f2b..f59eb0816 100644 --- a/apps/nextjs13-approuter/CHANGELOG.md +++ b/apps/nextjs13-approuter/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +**Note:** Version bump only for package nextjs13-approuter + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package nextjs13-approuter diff --git a/apps/nextjs13-approuter/package.json b/apps/nextjs13-approuter/package.json index d24ece270..268f39c1f 100644 --- a/apps/nextjs13-approuter/package.json +++ b/apps/nextjs13-approuter/package.json @@ -1,6 +1,6 @@ { "name": "nextjs13-approuter", - "version": "2.9.0", + "version": "2.10.0", "private": true, "scripts": { "dev": "next dev", @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "13.5.6", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/apps/nextjs13-pagerouter/CHANGELOG.md b/apps/nextjs13-pagerouter/CHANGELOG.md index 1e33d2d01..d5815f8b8 100644 --- a/apps/nextjs13-pagerouter/CHANGELOG.md +++ b/apps/nextjs13-pagerouter/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +**Note:** Version bump only for package nextjs13-pagerouter + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package nextjs13-pagerouter diff --git a/apps/nextjs13-pagerouter/package.json b/apps/nextjs13-pagerouter/package.json index 252d279df..6c8e2d870 100644 --- a/apps/nextjs13-pagerouter/package.json +++ b/apps/nextjs13-pagerouter/package.json @@ -1,6 +1,6 @@ { "name": "nextjs13-pagerouter", - "version": "2.9.0", + "version": "2.10.0", "private": true, "scripts": { "dev": "next dev", @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "13.5.6", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/apps/nextjs14-approuter/CHANGELOG.md b/apps/nextjs14-approuter/CHANGELOG.md index e46716ac4..111435c9d 100644 --- a/apps/nextjs14-approuter/CHANGELOG.md +++ b/apps/nextjs14-approuter/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +**Note:** Version bump only for package nextjs14-approuter + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package nextjs14-approuter diff --git a/apps/nextjs14-approuter/package.json b/apps/nextjs14-approuter/package.json index 332fa01d7..ca1c5b219 100644 --- a/apps/nextjs14-approuter/package.json +++ b/apps/nextjs14-approuter/package.json @@ -1,6 +1,6 @@ { "name": "nextjs14-approuter", - "version": "2.9.0", + "version": "2.10.0", "private": true, "scripts": { "dev": "next dev", @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "14.0.3", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/apps/nextjs14-pagerouter/CHANGELOG.md b/apps/nextjs14-pagerouter/CHANGELOG.md index 49b90107e..022feaddd 100644 --- a/apps/nextjs14-pagerouter/CHANGELOG.md +++ b/apps/nextjs14-pagerouter/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +**Note:** Version bump only for package nextjs14-pagerouter + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package nextjs14-pagerouter diff --git a/apps/nextjs14-pagerouter/package.json b/apps/nextjs14-pagerouter/package.json index fa18c30e4..af67956c0 100644 --- a/apps/nextjs14-pagerouter/package.json +++ b/apps/nextjs14-pagerouter/package.json @@ -1,6 +1,6 @@ { "name": "nextjs14-pagerouter", - "version": "2.9.0", + "version": "2.10.0", "private": true, "scripts": { "dev": "next dev", @@ -9,8 +9,8 @@ "lint": "next lint" }, "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "14.0.3", "react": "^18.2.0", "react-dom": "^18.2.0" diff --git a/build.washingtonpost.com/CHANGELOG.md b/build.washingtonpost.com/CHANGELOG.md index 9a700b2f8..b41d00d77 100644 --- a/build.washingtonpost.com/CHANGELOG.md +++ b/build.washingtonpost.com/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-docs/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Bug Fixes + +- include onSelect callback in InputSelect selected documentation example ([f4697d5](https://github.com/washingtonpost/wpds-docs/commit/f4697d5087f37cdfb93f462295bb4531fb347fe3)) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-docs/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-docs/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-docs/compare/v2.8.1...v2.9.0) (2024-12-09) ### Bug Fixes diff --git a/build.washingtonpost.com/package.json b/build.washingtonpost.com/package.json index f64563581..da9095979 100644 --- a/build.washingtonpost.com/package.json +++ b/build.washingtonpost.com/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/wpds-docs", - "version": "2.9.0", + "version": "2.10.0", "private": true, "scripts": { "dev": "next-remote-watch ./docs", @@ -27,9 +27,9 @@ "@washingtonpost/site-footer": "0.25.3-alpha.1", "@washingtonpost/tachyons-css": "^1.8.0", "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-tailwind-theme": "2.9.0", - "@washingtonpost/wpds-tokens": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-tailwind-theme": "2.10.0", + "@washingtonpost/wpds-tokens": "2.10.0", "@washingtonpost/wpds-ui-kit": "file:../packages/kit", "fuse.js": "^6.6.2", "gray-matter": "^4.0.2", diff --git a/lerna.json b/lerna.json index cee53b20c..12e285cc1 100644 --- a/lerna.json +++ b/lerna.json @@ -28,5 +28,5 @@ "registry": "https://registry.npmjs.org/" } }, - "version": "2.9.0" + "version": "2.10.0" } diff --git a/package-lock.json b/package-lock.json index 65b4b0045..77fc2f638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,10 +115,10 @@ } }, "apps/nextjs13-approuter": { - "version": "2.9.0", + "version": "2.10.0", "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "13.5.6", "react": "^18.2.0", "react-dom": "^18.2.0" @@ -199,10 +199,10 @@ } }, "apps/nextjs13-pagerouter": { - "version": "2.9.0", + "version": "2.10.0", "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "13.5.6", "react": "^18.2.0", "react-dom": "^18.2.0" @@ -283,20 +283,20 @@ } }, "apps/nextjs14-approuter": { - "version": "2.9.0", + "version": "2.10.0", "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "14.0.3", "react": "^18.2.0", "react-dom": "^18.2.0" } }, "apps/nextjs14-pagerouter": { - "version": "2.9.0", + "version": "2.10.0", "dependencies": { - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "next": "14.0.3", "react": "^18.2.0", "react-dom": "^18.2.0" @@ -310,7 +310,7 @@ }, "build.washingtonpost.com": { "name": "@washingtonpost/wpds-docs", - "version": "2.9.0", + "version": "2.10.0", "hasInstallScript": true, "dependencies": { "@babel/standalone": "^7.17.11", @@ -328,9 +328,9 @@ "@washingtonpost/site-footer": "0.25.3-alpha.1", "@washingtonpost/tachyons-css": "^1.8.0", "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-kitchen-sink": "2.9.0", - "@washingtonpost/wpds-tailwind-theme": "2.9.0", - "@washingtonpost/wpds-tokens": "2.9.0", + "@washingtonpost/wpds-kitchen-sink": "2.10.0", + "@washingtonpost/wpds-tailwind-theme": "2.10.0", + "@washingtonpost/wpds-tokens": "2.10.0", "@washingtonpost/wpds-ui-kit": "file:../packages/kit", "fuse.js": "^6.6.2", "gray-matter": "^4.0.2", @@ -38956,10 +38956,10 @@ }, "packages/eslint-plugin": { "name": "@washingtonpost/eslint-plugin-wpds", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "dependencies": { - "@washingtonpost/wpds-ui-kit": "2.9.0" + "@washingtonpost/wpds-ui-kit": "2.10.0" }, "devDependencies": { "jest": "^28.1.0" @@ -39937,7 +39937,7 @@ }, "packages/kit": { "name": "@washingtonpost/wpds-ui-kit", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "dependencies": { "@popperjs/core": "^2.11.6", @@ -40005,11 +40005,11 @@ }, "packages/kitchen-sink": { "name": "@washingtonpost/wpds-kitchen-sink", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "dependencies": { "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "nanoid": "^3.3.4" }, "devDependencies": { @@ -40024,10 +40024,10 @@ }, "packages/tailwind-theme": { "name": "@washingtonpost/wpds-tailwind-theme", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "dependencies": { - "@washingtonpost/wpds-ui-kit": "2.9.0" + "@washingtonpost/wpds-ui-kit": "2.10.0" }, "devDependencies": { "autoprefixer": "^10.4.14", @@ -40041,11 +40041,11 @@ }, "packages/tokens": { "name": "@washingtonpost/wpds-tokens", - "version": "2.9.0", + "version": "2.10.0", "license": "MIT", "devDependencies": { "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "react": "^18.2.0", "react-dom": "^18.2.0" } diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md index 273b970a4..d47c50e4e 100644 --- a/packages/eslint-plugin/CHANGELOG.md +++ b/packages/eslint-plugin/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package @washingtonpost/eslint-plugin-wpds diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 467fa202b..6393a4e0d 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/eslint-plugin-wpds", - "version": "2.9.0", + "version": "2.10.0", "description": "WPDS lint rules", "author": "WPDS Support ", "homepage": "https://github.com/washingtonpost/wpds-ui-kit#readme", @@ -28,7 +28,7 @@ "@washingtonpost/wpds-ui-kit": "2.9.0" }, "dependencies": { - "@washingtonpost/wpds-ui-kit": "2.9.0" + "@washingtonpost/wpds-ui-kit": "2.10.0" }, "devDependencies": { "jest": "^28.1.0" diff --git a/packages/kit/CHANGELOG.md b/packages/kit/CHANGELOG.md index 16624443b..0cbd4220f 100644 --- a/packages/kit/CHANGELOG.md +++ b/packages/kit/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Bug Fixes + +- allow controlled InputSearch to be cleared by passing empty string ([f874afd](https://github.com/washingtonpost/wpds-ui-kit/commit/f874afd58dba13d242e2d38330b4d7ffe6d0ef5a)) +- allow props on InputSearch ListItem to pass through for custom styling ([07b7bdc](https://github.com/washingtonpost/wpds-ui-kit/commit/07b7bdc23eb7e05d1e80465bfba1fc2189d6f70b)) +- honor disabled prop in InputSearch list item ([62f88ec](https://github.com/washingtonpost/wpds-ui-kit/commit/62f88ecfd087f02e5373b89c36a59a367c9536bc)) +- safely escape strings passed to RegExp in InputSearch ([66fc814](https://github.com/washingtonpost/wpds-ui-kit/commit/66fc8143dc4c43aa555b718b507c50f017b90b44)) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) ### Features diff --git a/packages/kit/package.json b/packages/kit/package.json index 2670989b8..f0eb27796 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/wpds-ui-kit", - "version": "2.9.0", + "version": "2.10.0", "description": "WPDS UI Kit", "author": "WPDS Support ", "homepage": "https://github.com/washingtonpost/wpds-ui-kit#readme", diff --git a/packages/kitchen-sink/CHANGELOG.md b/packages/kitchen-sink/CHANGELOG.md index f92f44ffd..07e05318a 100644 --- a/packages/kitchen-sink/CHANGELOG.md +++ b/packages/kitchen-sink/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package @washingtonpost/wpds-kitchen-sink diff --git a/packages/kitchen-sink/package.json b/packages/kitchen-sink/package.json index 2f7ff5fb2..16214c9f4 100644 --- a/packages/kitchen-sink/package.json +++ b/packages/kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/wpds-kitchen-sink", - "version": "2.9.0", + "version": "2.10.0", "description": "WPDS Kitchen Sink", "author": "WPDS Support ", "homepage": "https://github.com/washingtonpost/wpds-ui-kit#readme", @@ -42,7 +42,7 @@ }, "dependencies": { "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "nanoid": "^3.3.4" }, "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" diff --git a/packages/tailwind-theme/CHANGELOG.md b/packages/tailwind-theme/CHANGELOG.md index 2601094f0..bf1f1688a 100644 --- a/packages/tailwind-theme/CHANGELOG.md +++ b/packages/tailwind-theme/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package @washingtonpost/wpds-tailwind-theme diff --git a/packages/tailwind-theme/package.json b/packages/tailwind-theme/package.json index 3b5aeedfa..669e5690a 100644 --- a/packages/tailwind-theme/package.json +++ b/packages/tailwind-theme/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/wpds-tailwind-theme", - "version": "2.9.0", + "version": "2.10.0", "description": "WPDS Tailwind Theme", "author": "WPDS Support ", "license": "MIT", @@ -20,7 +20,7 @@ "@washingtonpost/wpds-ui-kit": "2.9.0" }, "dependencies": { - "@washingtonpost/wpds-ui-kit": "2.9.0" + "@washingtonpost/wpds-ui-kit": "2.10.0" }, "devDependencies": { "autoprefixer": "^10.4.14", diff --git a/packages/tokens/CHANGELOG.md b/packages/tokens/CHANGELOG.md index 73bc3bafc..4d41e341f 100644 --- a/packages/tokens/CHANGELOG.md +++ b/packages/tokens/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.10.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.9.0...v2.10.0) (2024-12-11) + +### Features + +- update wpds-assets ([#676](https://github.com/washingtonpost/wpds-ui-kit/issues/676)) ([0cb0ae6](https://github.com/washingtonpost/wpds-ui-kit/commit/0cb0ae65bcc9faac805f5ec295a6fe3548636278)) + # [2.9.0](https://github.com/washingtonpost/wpds-ui-kit/compare/v2.8.1...v2.9.0) (2024-12-09) **Note:** Version bump only for package @washingtonpost/wpds-tokens diff --git a/packages/tokens/package.json b/packages/tokens/package.json index 79ed6563a..3b4993d66 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -1,6 +1,6 @@ { "name": "@washingtonpost/wpds-tokens", - "version": "2.9.0", + "version": "2.10.0", "description": "WPDS Tokens", "author": "WPDS Support ", "homepage": "https://github.com/washingtonpost/wpds-ui-kit#readme", @@ -27,7 +27,7 @@ "license": "MIT", "devDependencies": { "@washingtonpost/wpds-assets": "^2.9.0", - "@washingtonpost/wpds-ui-kit": "2.9.0", + "@washingtonpost/wpds-ui-kit": "2.10.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, From f69d664bb1dbd0e523779777eb0ea68e6c2420ca Mon Sep 17 00:00:00 2001 From: wp-aberg Date: Wed, 11 Dec 2024 16:59:50 +0000 Subject: [PATCH 9/9] Apply automatic changes --- packages/eslint-plugin/package.json | 2 +- packages/kit/package.json | 2 +- packages/kitchen-sink/package.json | 2 +- packages/tailwind-theme/package.json | 2 +- packages/tokens/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json index 6393a4e0d..ca9614b43 100644 --- a/packages/eslint-plugin/package.json +++ b/packages/eslint-plugin/package.json @@ -33,5 +33,5 @@ "devDependencies": { "jest": "^28.1.0" }, - "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" + "gitHead": "8690322aa8bd22e196ac46a18563253f1dfbe994" } diff --git a/packages/kit/package.json b/packages/kit/package.json index f0eb27796..e285da991 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -93,5 +93,5 @@ "./src/input-search/cities": "./src/input-search/cities.ts", "./src/theme/hexcodes.tokens.json": "./src/theme/hexcodes.tokens.json" }, - "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" + "gitHead": "8690322aa8bd22e196ac46a18563253f1dfbe994" } diff --git a/packages/kitchen-sink/package.json b/packages/kitchen-sink/package.json index 16214c9f4..a78d0909b 100644 --- a/packages/kitchen-sink/package.json +++ b/packages/kitchen-sink/package.json @@ -45,5 +45,5 @@ "@washingtonpost/wpds-ui-kit": "2.10.0", "nanoid": "^3.3.4" }, - "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" + "gitHead": "8690322aa8bd22e196ac46a18563253f1dfbe994" } diff --git a/packages/tailwind-theme/package.json b/packages/tailwind-theme/package.json index 669e5690a..cdc635ab7 100644 --- a/packages/tailwind-theme/package.json +++ b/packages/tailwind-theme/package.json @@ -28,5 +28,5 @@ "tailwindcss": "^3.3.2", "vite": "^4.3.9" }, - "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" + "gitHead": "8690322aa8bd22e196ac46a18563253f1dfbe994" } diff --git a/packages/tokens/package.json b/packages/tokens/package.json index 3b4993d66..7a27aac23 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -31,5 +31,5 @@ "react": "^18.2.0", "react-dom": "^18.2.0" }, - "gitHead": "a51790c76489c2b2a24ccd29eb8addb83ce29d8e" + "gitHead": "8690322aa8bd22e196ac46a18563253f1dfbe994" }