diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md index 57ed9edf..1463fb5f 100644 --- a/docs/pages/resources/changelog.md +++ b/docs/pages/resources/changelog.md @@ -14,6 +14,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti ## Next +- Fixed type issues with the `ref` attribute in React Wrappers. [#1526] - Fixed a regression that caused `` to render incorrectly with gaps [#1523] - Improved expand/collapse behavior of `` to work more like users expect [#1521] diff --git a/package-lock.json b/package-lock.json index 7351e3c5..acf21a85 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@ctrl/tinycolor": "^3.5.0", "@floating-ui/dom": "^1.2.1", - "@lit-labs/react": "^1.1.1", + "@lit-labs/react": "^1.2.1", "@shoelace-style/animations": "^1.1.0", "@shoelace-style/localize": "^3.1.1", "composed-offset-position": "^0.0.4", @@ -1474,9 +1474,9 @@ } }, "node_modules/@lit-labs/react": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz", - "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.2.1.tgz", + "integrity": "sha512-DiZdJYFU0tBbdQkfwwRSwYyI/mcWkg3sWesKRsHUd4G+NekTmmeq9fzsurvcKTNVa0comNljwtg4Hvi1ds3V+A==" }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.1.1", @@ -18291,9 +18291,9 @@ } }, "@lit-labs/react": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.1.1.tgz", - "integrity": "sha512-9TC+/ZWb6BJlWCyUr14FKFlaGnyKpeEDorufXozQgke/VoVrslUQNaL7nBmrAWdNrmzx5jWgi8lFmWwrxMjnlA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-1.2.1.tgz", + "integrity": "sha512-DiZdJYFU0tBbdQkfwwRSwYyI/mcWkg3sWesKRsHUd4G+NekTmmeq9fzsurvcKTNVa0comNljwtg4Hvi1ds3V+A==" }, "@lit-labs/ssr-dom-shim": { "version": "1.1.1", diff --git a/package.json b/package.json index 55554f47..9b1e2b80 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "dependencies": { "@ctrl/tinycolor": "^3.5.0", "@floating-ui/dom": "^1.2.1", - "@lit-labs/react": "^1.1.1", + "@lit-labs/react": "^1.2.1", "@shoelace-style/animations": "^1.1.0", "@shoelace-style/localize": "^3.1.1", "composed-offset-position": "^0.0.4", diff --git a/scripts/make-react.js b/scripts/make-react.js index db31c97e..6169dd34 100644 --- a/scripts/make-react.js +++ b/scripts/make-react.js @@ -51,6 +51,15 @@ components.map(component => { ${eventImports} ${eventExports} + export type ForwardComponent< + Element extends HTMLElement, + ReactComponent extends React.ElementType + > = React.JSXElementConstructor< + React.ComponentPropsWithoutRef & { + ref?: React.ForwardedRef; + } + > & { displayName?: string } + const tagName = '${component.tagName}' const component = createComponent({ @@ -76,7 +85,7 @@ components.map(component => { } } - export default SlComponent; + export default SlComponent as ForwardComponent; `, Object.assign(prettierConfig, { parser: 'babel-ts'