Merge branch 'main' into staging/4.0

bennypowers · bennypowers · commit 8190f8ab328a · 2024-06-21T11:19:19.000+03:00
diff --git a/.changeset/odd-months-flow.md b/.changeset/odd-months-flow.md
diff --git a/.changeset/purple-boxes-stare.md b/.changeset/purple-boxes-stare.md
@@ -0,0 +1,5 @@
+---
+"@patternfly/elements": patch
+---
+
+`<pf-back-to-top>`: fix hover color
diff --git a/.changeset/upset-birds-mix.md b/.changeset/upset-birds-mix.md
diff --git a/docs/_data/importMap.cjs b/docs/_data/importMap.cjs
@@ -77,7 +77,7 @@ module.exports = async function() {
   const { Generator } = await import('@jspm/generator');
 
   const generator = new Generator({
-    defaultProvider: 'jspm.io',
+    defaultProvider: 'jsdelivr',
     env: ['production', 'browser', 'module'],
   });
 
diff --git a/elements/CHANGELOG.md b/elements/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @patternfly/elements
 
+## 3.0.2
+
+### Patch Changes
+
+- 9702278: `<pf-clipboard-copy>`: corrected size of copy button
+
 ## 3.0.1
 
 ### Patch Changes
diff --git a/elements/package.json b/elements/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@patternfly/elements",
   "license": "MIT",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "PatternFly Elements",
   "customElements": "custom-elements.json",
   "type": "module",
@@ -125,7 +125,8 @@
     "Nikki Massaro Kauffman <nmassaro@redhat.com> (https://github.com/nikkimk)",
     "Steven Spriggs <sspriggs@redhat.com",
     "castastrophe (https://github.com/castastrophe)",
-    "Wes Ruvalcaba"
+    "Wes Ruvalcaba",
+    "Ajinyka Shinde <sajinkya359@gmail.com>"
   ],
   "dependencies": {
     "@lit/context": "^1.1.0",
diff --git a/elements/pf-back-to-top/pf-back-to-top.css b/elements/pf-back-to-top/pf-back-to-top.css
@@ -29,6 +29,16 @@ a {
   gap: var(--pf-c-button__icon--m-end--MarginLeft, var(--pf-global--spacer--xs, 0.25rem));
 }
 
+a:hover {
+  --pf-c-button--m-primary--Color: var(--pf-c-button--m-primary--hover--Color, var(--pf-global--Color--light-100, #fff));
+  --pf-c-button--m-primary--BackgroundColor: var(--pf-c-button--m-primary--hover--BackgroundColor, var(--pf-global--primary-color--200, #004080));
+}
+
+a:focus {
+  --pf-c-button--m-primary--Color: var(--pf-c-button--m-primary--hover--Color, var(--pf-global--Color--light-100,#fff));
+  --pf-c-button--m-primary--BackgroundColor: var(--pf-c-button--m-primary--hover--BackgroundColor, var(--pf-global--primary-color--200, #004080));
+}
+
 [part="trigger"][hidden] {
   display: none;
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/tools/pfe-tools/CHANGELOG.md b/tools/pfe-tools/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @patternfly/pfe-tools
 
+## 2.0.3
+
+### Patch Changes
+
+- aca8409: **React**: ensure that only classes which are exported get wrapped
+
+## 2.0.2
+
+### Patch Changes
+
+- c57c5dd: Dev Server: redirect demo links to css lightdom subresources
+- 9995136: **React**: corrected syntax error in some generated modules
+
 ## 2.0.1
 
 ### Patch Changes
diff --git a/tools/pfe-tools/package.json b/tools/pfe-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@patternfly/pfe-tools",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "type": "module",
   "description": "Development and build tools for PatternFly Elements and related projects",
   "keywords": [
diff --git a/tools/pfe-tools/react/generate-wrappers.ts b/tools/pfe-tools/react/generate-wrappers.ts
@@ -22,6 +22,12 @@ function isCustomElementDeclaration(
   return !!(declaration as CEM.CustomElementDeclaration).customElement;
 }
 
+function isExported(exports: CEM.Export[] | undefined) {
+  return function(declaration: CEM.Declaration): boolean {
+    return !!exports?.some(exp => exp.kind === 'js' && exp.declaration.name === declaration.name);
+  };
+}
+
 /** Remove a prefix from a class name */
 function getDeprefixedClassName(className: string, prefix: string) {
   const [fst, ...tail] = className.replace(prefix, '');
@@ -80,10 +86,10 @@ function genJavascriptModule(module: CEM.Module, pkgName: string, data: ReactWra
   return javascript`// ${module.path}
 import { createComponent } from '@lit/react';
 import react from 'react';${data.map(x => javascript`
-import { ${x.Class} as elementClass } from '${pkgName}/${module.path}';`)}${data.map(x => javascript`
+import { ${x.Class} } from '${pkgName}/${module.path}';`).join('')}${data.map(x => javascript`
 export const ${x.reactComponentName} = createComponent({
   tagName: '${x.tagName}',
-  elementClass,
+  elementClass: ${x.Class},
   react,
   events: ${x.eventsMap},
 });`).join('\n')}
@@ -93,8 +99,8 @@ export const ${x.reactComponentName} = createComponent({
 function genTypescriptModule(module: CEM.Module, pkgName: string, data: ReactWrapperData[]) {
   return typescript`// ${module.path}
 import type { ReactWebComponent } from '@lit/react';${data.map(x => typescript`
-import type { ${x.Class} } from '${pkgName}/${module.path}';`)}${data.map(x => typescript`
-export const ${x.reactComponentName}: ReactWebComponent<${x.Class}, ${x.eventsInterface}>;`)}
+import type { ${x.Class} } from '${pkgName}/${module.path}';`).join('')}${data.map(x => typescript`
+export const ${x.reactComponentName}: ReactWebComponent<${x.Class}, ${x.eventsInterface}>;`).join('\n')}
   `;
 }
 
@@ -106,6 +112,7 @@ function genWrapperModules(
 ) {
   const data: ReactWrapperData[] = (module.declarations ?? [])
       .filter(isCustomElementDeclaration)
+      .filter(isExported(module.exports))
       .map(getReactWrapperData(module, classPrefix, elPrefix));
   const js = genJavascriptModule(module, pkgName, data);
   const ts = genTypescriptModule(module, pkgName, data);

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@patternfly/elements": patch
 +---
++
 +`<pf-back-to-top>`: fix hover color
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@patternfly/pfe-tools",`
`3`		`- "version": "2.0.1",`
	`3`	`+ "version": "2.0.3",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Development and build tools for PatternFly Elements and related projects",`
`6`	`6`	`"keywords": [`