resolve feedback

update changelog
Merge branch 'next' into submenus
2026-01-13 20:49:15 +00:00 · 2023-08-21 10:56:25 -04:00 · 2023-08-18 14:47:58 -04:00 · 2023-08-18 14:43:17 -04:00 · 2023-08-18 14:40:21 -04:00 · 2023-08-18 14:18:38 -04:00
7 changed files with 58 additions and 36 deletions
--- a/docs/_includes/component.njk
+++ b/docs/_includes/component.njk
@@ -137,17 +137,15 @@
          <tr>
            <td>
              <code class="nowrap">{{ prop.name }}</code>
-              {% if prop.attribute | length > 0 %}
-                {% if prop.attribute != prop.name %}
-                  <br>
-                  <sl-tooltip content="This attribute is different from its property">
-                    <small>
-                      <code class="nowrap">
-                        {{ prop.attribute }}
-                      </code>
-                    </small>
-                  </sl-tooltip>
-                {% endif %}
+              {% if prop.attribute != prop.name %}
+                <br>
+                <sl-tooltip content="This attribute is different from its property">
+                  <small>
+                    <code class="nowrap">
+                      {{ prop.attribute }}
+                    </code>
+                  </small>
+                </sl-tooltip>
              {% endif %}
            </td>
            <td>
--- a/docs/pages/resources/changelog.md
+++ b/docs/pages/resources/changelog.md
@@ -20,8 +20,6 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 - Fixed a regression that caused `<sl-radio-button>` to render incorrectly with gaps [#1523]
 - Improved expand/collapse behavior of `<sl-tree>` to work more like users expect [#1521]
 - Improved `<sl-menu-item>` so labels truncate properly instead of getting chopped and overflowing
- Removed the extra `React.Component` around `@lit-labs/react` wrapper. [#1531]
- Upgrade `@lit-labs/react` to v2.0.1. [#1531]

 ## 2.7.0

--- 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": "^2.0.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,12 +1474,9 @@
      }
    },
    "node_modules/@lit-labs/react": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-2.0.1.tgz",
-      "integrity": "sha512-Nj+XB3HamqaWefN91lpFPJaqjJ78XzGkPWCedB4jyH22GBFEenpE9A/h8B/2dnIGXtNtd9D/RFpUdQ/dBtWFqA==",
-      "peerDependencies": {
-        "@types/react": "17 || 18"
-      }
+      "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",
@@ -2273,7 +2270,8 @@
    "node_modules/@types/prop-types": {
      "version": "15.7.4",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
+      "dev": true
    },
    "node_modules/@types/qs": {
      "version": "6.9.7",
@@ -2291,6 +2289,7 @@
      "version": "18.0.26",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
      "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
+      "dev": true,
      "dependencies": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -2318,7 +2317,8 @@
    "node_modules/@types/scheduler": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
+      "dev": true
    },
    "node_modules/@types/semver": {
      "version": "7.5.0",
@@ -5685,7 +5685,8 @@
    "node_modules/csstype": {
      "version": "3.0.10",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==",
+      "dev": true
    },
    "node_modules/custom-element-jet-brains-integration": {
      "version": "1.1.0",
@@ -18290,10 +18291,9 @@
      }
    },
    "@lit-labs/react": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@lit-labs/react/-/react-2.0.1.tgz",
-      "integrity": "sha512-Nj+XB3HamqaWefN91lpFPJaqjJ78XzGkPWCedB4jyH22GBFEenpE9A/h8B/2dnIGXtNtd9D/RFpUdQ/dBtWFqA==",
-      "requires": {}
+      "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",
@@ -18998,7 +18998,8 @@
    "@types/prop-types": {
      "version": "15.7.4",
      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
-      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
+      "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==",
+      "dev": true
    },
    "@types/qs": {
      "version": "6.9.7",
@@ -19016,6 +19017,7 @@
      "version": "18.0.26",
      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz",
      "integrity": "sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug==",
+      "dev": true,
      "requires": {
        "@types/prop-types": "*",
        "@types/scheduler": "*",
@@ -19043,7 +19045,8 @@
    "@types/scheduler": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
-      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
+      "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",
+      "dev": true
    },
    "@types/semver": {
      "version": "7.5.0",
@@ -21511,7 +21514,8 @@
    "csstype": {
      "version": "3.0.10",
      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz",
-      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA=="
+      "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==",
+      "dev": true
    },
    "custom-element-jet-brains-integration": {
      "version": "1.1.0",
--- 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": "^2.0.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",
--- a/scripts/make-react.js
+++ b/scripts/make-react.js
@@ -51,11 +51,18 @@ components.map(component => {
      ${eventImports}
      ${eventExports}

-      const tagName = '${component.tagName}'
-      Component.define('${component.tagName}')
+      export type ForwardComponent<
+        Element extends HTMLElement,
+        ReactComponent extends React.ElementType
+      > = React.JSXElementConstructor<
+        React.ComponentPropsWithoutRef<ReactComponent> & {
+          ref?: React.ForwardedRef<Element>;
+        }
+      > & { displayName?: string }

-      ${jsDoc}
-      const reactWrapper = createComponent({
+      const tagName = '${component.tagName}'
+
+      const component = createComponent({
        tagName,
        elementClass: Component,
        react: React,
@@ -65,7 +72,20 @@ components.map(component => {
        displayName: "${component.name}"
      })

-      export default reactWrapper
+      ${jsDoc}
+      class SlComponent extends React.Component<Parameters<typeof component>[0]> {
+        constructor (...args: Parameters<typeof component>) {
+          super(...args)
+          Component.define(tagName)
+        }
+
+        render () {
+          const { children, ...props } = this.props
+          return React.createElement(component, props, children)
+        }
+      }
+
+      export default SlComponent as ForwardComponent<Component, typeof SlComponent>;
    `,
    Object.assign(prettierConfig, {
      parser: 'babel-ts'
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,6 +28,7 @@
    "skipLibCheck": true,
    "forceConsistentCasingInFileNames": true,
    "useUnknownInCatchVariables": true,
+    "baseUrl": ".",
    "types": [
      "mocha",
      "user-agent-data-types"
--- a/tsconfig.prod.json
+++ b/tsconfig.prod.json
@@ -1,6 +1,7 @@
 {
  "extends": "./tsconfig",
  "compilerOptions": {
+    "baseUrl": ".",
    "rootDir": "./src"
  },
  "include": ["src"],
Author	SHA1	Message	Date
Cory LaViska	3217ce9f76	resolve feedback	2023-08-21 10:56:25 -04:00
Cory LaViska	c6d69fdbd6	update changelog	2023-08-18 14:47:58 -04:00
Cory LaViska	77b40fa7b4	Merge branch 'next' into submenus	2023-08-18 14:43:17 -04:00
Cory LaViska	bebf74a1fb	stay highlighted when submenu is open	2023-08-18 14:40:21 -04:00
Cory LaViska	f524d20216	polish up submenu stuff	2023-08-18 14:18:38 -04:00
Cory LaViska	021c32ab32	Merge branch 'next-eycrb' of github.com:ecyrb/shoelace-ecyrb-fork into ecyrb-next-eycrb	2023-08-18 13:04:14 -04:00
Bryce Moore	dbf506d78f	Submenu tweaks ... - 100 ms delay when opening submenus on mouseover - Shadows added - Distance added to popup to have submenus overlap menu slightly.	2023-07-14 15:13:07 -04:00
Bryce Moore	1d826a9c53	fix: Prevent menu's extraneous Enter / space key propagation. Menu's handleKeyDown calls item.click (to emit the selection). Propagating the keyboard event on Enter / space would the cause re-entry into a submenu, so prevent the needless propagation.	2023-07-13 09:55:45 -04:00
Bryce Moore	58d6cad39a	fix: 2 changes to menu / submenu on-click behavior: 1. Close submenu on click explicitly, so this occurs even if the menu is not inside of an sl-dropdown. 2. In menu, ignore clicks that do not explicitly target a menu-item. Clicks that were on (e.g. a menu-border) were emitting select events.	2023-07-13 08:49:10 -04:00
Bryce Moore	e0e96c8a0a	style: Eslint warnings and errors fixed. npm run verify now passes.	2023-07-13 06:26:44 -04:00
Bryce Moore	25a146ffd1	Cleanup: Removed dead code and dead code comments.	2023-07-11 02:50:48 -04:00
Bryce Moore	c55ba0467e	Merge branch 'next' into next-eycrb	2023-07-08 08:16:46 -04:00
Bryce Moore	126b0e34bd	[WIP] Submenu WIP continues. - Submenus now close on change-of-focus, not a timeout. - Keyboard navigation support added. - Skidding fix for better alignment. - Submenu documentation moved to Menu page. - Tests for accessibility, right and left arrow keys.	2023-07-07 09:43:40 -04:00
Bryce Moore	7aca8d7300	Revert "PoC working of ArrowRight to focus on submenu." (Didn't mean to publish this.) This reverts commit `be04e9a221`.	2023-06-30 09:52:54 -04:00
Bryce Moore	be04e9a221	PoC working of ArrowRight to focus on submenu.	2023-06-30 07:44:55 -04:00
Bryce	354404484e	Update submenu-controller.ts Removed extraneous `console.log()`.	2023-06-28 02:43:51 -04:00
Bryce Moore	b48d072bc8	[RFC] Proof-of-concept commit for submenu support This is a Request For Comments to seek directional guidance towards implementing the submenu slot of menu-item. Includes: - SubmenuController to manage event listeners on menu-item. - Example usage in menu-item documentation. - Trivial tests to check rendering. Outstanding questions include: - Accessibility concerns. E.g. where to handle 'ArrowRight', 'ArrowLeft'? - Should selection of menu-item denoting submenu be possible or customizable? - How to parameterize contained popup? - Implementation concerns: - Use of ref / id - delegation of some rendering to the controller - What to test Related to [#620](https://github.com/shoelace-style/shoelace/issues/620).	2023-06-28 01:08:37 -04:00