Skip to content

Commit

Permalink
Automatic update to new version.
Browse files Browse the repository at this point in the history
  • Loading branch information
thaibault committed Mar 4, 2024
1 parent 02a0aa9 commit 973d502
Show file tree
Hide file tree
Showing 8 changed files with 133 additions and 51 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
--- ../node_modules/@rmwc/ripple/index.js 2023-12-01 17:24:42
+++ index.alternate.js 2023-12-01 17:24:25
diff --git a/index.js b/index.js
index 0e7b1179d008ded6246d4f7b511e0b71d9e595c3..4b84b41bfed830863d1e57b04c780bc128087424 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("react/jsx-runtime"),s=require("react"),k=require("@rmwc/base"),B=require("@rmwc/provider"),S=require("@material/ripple"),F=t=>{const d=s.useRef(!1),{foundation:n,...i}=k.useFoundation({props:t,elements:{rootEl:!0,surfaceEl:!0},foundation:({rootEl:e,surfaceEl:E,getProps:N})=>new S.MDCRippleFoundation({addClass:r=>{E.addClass(r)},browserSupportsCssVars:()=>S.util.supportsCssVariables(window),computeBoundingRect:()=>e.ref?e.ref.getBoundingClientRect():k.emptyClientRect,containsEventTarget:r=>!!e.ref&&e.ref.contains(r),deregisterDocumentInteractionHandler:(r,m)=>document.documentElement.removeEventListener(r,m),deregisterInteractionHandler:(r,m)=>{},deregisterResizeHandler:r=>window.removeEventListener("resize",r),getWindowPageOffset:()=>({x:window.pageXOffset,y:window.pageYOffset}),isSurfaceActive:()=>e.ref?k.matches(e.ref,":active"):!1,isSurfaceDisabled:()=>!!N().disabled,removeClass:r=>{E.removeClass(r)},isUnbounded:()=>!!N().unbounded,registerDocumentInteractionHandler:(r,m)=>document.documentElement.addEventListener(r,m,{passive:!0}),registerInteractionHandler:(r,m)=>{},registerResizeHandler:r=>window.addEventListener("resize",r),updateCssVariable:(r,m)=>E.setStyle(r,m)})}),{rootEl:o}=i,a=s.useCallback(e=>{e.persist(),n.activate(e)},[n]),c=s.useCallback(e=>{e.persist(),n.deactivate()},[n]),{onFocus:p}=t,b=s.useCallback(e=>{p==null||p(e),n.handleFocus()},[n,p]),{onBlur:l}=t,R=s.useCallback(e=>{l==null||l(e),n.handleBlur()},[n,l]),{onMouseDown:u}=t,x=s.useCallback(e=>{u==null||u(e),d.current||a(e),d.current=!1},[u,a]),{onMouseUp:h}=t,y=s.useCallback(e=>{h==null||h(e),c(e)},[h,c]),{onTouchStart:f}=t,P=s.useCallback(e=>{d.current=!0,f==null||f(e),a(e)},[f,a]),{onTouchEnd:w}=t,D=s.useCallback(e=>{w==null||w(e),c(e)},[w,c]),{onKeyDown:v}=t,H=s.useCallback(e=>{v==null||v(e),a(e)},[v,a]),{onKeyUp:g}=t,q=s.useCallback(e=>{g==null||g(e),c(e)},[g,c]);return o.setProp("onFocus",b,!0),o.setProp("onBlur",R,!0),o.setProp("onMouseDown",x,!0),o.setProp("onMouseUp",y,!0),o.setProp("onTouchStart",P,!0),o.setProp("onTouchEnd",D,!0),o.setProp("onKeyDown",H,!0),o.setProp("onKeyUp",q,!0),s.useEffect(()=>{n.setUnbounded(!!t.unbounded)},[t.unbounded,n]),s.useEffect(()=>{t.disabled&&n.handleBlur()},[t.disabled,n]),{...i}},j=s.createContext({});function T(t){const{children:d,className:n,primary:i,accent:o,unbounded:a,surface:c,foundationRef:p,...b}=t,{rootEl:l,surfaceEl:R}=F(t),u=s.Children.only(d);if(!s.isValidElement(u))return null;const x=!c||!a,h=a?{"data-mdc-ripple-is-unbounded":!0}:{},y=x?R.props({style:u.props.style}):{};let f=k.classNames(n!==u.props.className&&n,y.className,u.props.className,{"mdc-ripple-surface":typeof c=="boolean"?c:c===void 0,"mdc-ripple-surface--primary":i,"rmwc-ripple-surface--primary":i,"mdc-ripple-surface--accent":o,"rmwc-ripple-surface--accent":o});b.disabled&&(f=f.replace("mdc-ripple-upgraded--background-focused",""));const P=s.cloneElement(u,{ref:l.reactRef,...u.props,...h,...l.props({...b,style:u.props.style,...y,className:f})});return C.jsx(j.Provider,{value:R.props({style:u.props.style}),children:P})}const I=({className:t,...d})=>C.jsx(j.Consumer,{children:n=>C.jsx("div",{...d,...n,className:`${t} ${n.className||""}`})}),O=({unbounded:t,accent:d,surface:n}={})=>i=>{const o=s.forwardRef(({ripple:a,...c},p)=>{const b=B.useProviderContext();a=a??b.ripple;const l=typeof a!="object"?{}:a;return a?C.jsx(T,{...c,accent:l.accent||d,unbounded:l.unbounded||t,surface:l.surface||n,children:C.jsx(i,{...c,ref:p})}):C.jsx(i,{...c,ref:p})});return o.displayName=`withRipple(${i.displayName||i.constructor.name||"Unknown"})`,o};exports.Ripple=T;exports.RippleSurface=I;exports.withRipple=O;
+"use strict";var mergeRefs = function(a, b) {return function(el) {if (typeof a === 'function') a(el); else if (a && 'current' in a) a.current = el;if (typeof b === 'function') b(el); else if (b && 'current' in b) b.current = el}};Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("react/jsx-runtime"),s=require("react"),k=require("@rmwc/base"),B=require("@rmwc/provider"),S=require("@material/ripple"),F=t=>{const d=s.useRef(!1),{foundation:n,...i}=k.useFoundation({props:t,elements:{rootEl:!0,surfaceEl:!0},foundation:({rootEl:e,surfaceEl:E,getProps:N})=>new S.MDCRippleFoundation({addClass:r=>{E.addClass(r)},browserSupportsCssVars:()=>S.util.supportsCssVariables(window),computeBoundingRect:()=>e.ref?e.ref.getBoundingClientRect():k.emptyClientRect,containsEventTarget:r=>!!e.ref&&e.ref.contains(r),deregisterDocumentInteractionHandler:(r,m)=>document.documentElement.removeEventListener(r,m),deregisterInteractionHandler:(r,m)=>{},deregisterResizeHandler:r=>window.removeEventListener("resize",r),getWindowPageOffset:()=>({x:window.pageXOffset,y:window.pageYOffset}),isSurfaceActive:()=>e.ref?k.matches(e.ref,":active"):!1,isSurfaceDisabled:()=>!!N().disabled,removeClass:r=>{E.removeClass(r)},isUnbounded:()=>!!N().unbounded,registerDocumentInteractionHandler:(r,m)=>document.documentElement.addEventListener(r,m,{passive:!0}),registerInteractionHandler:(r,m)=>{},registerResizeHandler:r=>window.addEventListener("resize",r),updateCssVariable:(r,m)=>E.setStyle(r,m)})}),{rootEl:o}=i,a=s.useCallback(e=>{e.persist(),n.activate(e)},[n]),c=s.useCallback(e=>{e.persist(),n.deactivate()},[n]),{onFocus:p}=t,b=s.useCallback(e=>{p==null||p(e),n.handleFocus()},[n,p]),{onBlur:l}=t,R=s.useCallback(e=>{l==null||l(e),n.handleBlur()},[n,l]),{onMouseDown:u}=t,x=s.useCallback(e=>{u==null||u(e),d.current||a(e),d.current=!1},[u,a]),{onMouseUp:h}=t,y=s.useCallback(e=>{h==null||h(e),c(e)},[h,c]),{onTouchStart:f}=t,P=s.useCallback(e=>{d.current=!0,f==null||f(e),a(e)},[f,a]),{onTouchEnd:w}=t,D=s.useCallback(e=>{w==null||w(e),c(e)},[w,c]),{onKeyDown:v}=t,H=s.useCallback(e=>{v==null||v(e),a(e)},[v,a]),{onKeyUp:g}=t,q=s.useCallback(e=>{g==null||g(e),c(e)},[g,c]);return o.setProp("onFocus",b,!0),o.setProp("onBlur",R,!0),o.setProp("onMouseDown",x,!0),o.setProp("onMouseUp",y,!0),o.setProp("onTouchStart",P,!0),o.setProp("onTouchEnd",D,!0),o.setProp("onKeyDown",H,!0),o.setProp("onKeyUp",q,!0),s.useEffect(()=>{n.setUnbounded(!!t.unbounded)},[t.unbounded,n]),s.useEffect(()=>{t.disabled&&n.handleBlur()},[t.disabled,n]),{...i}},j=s.createContext({});function T(t){const{children:d,className:n,primary:i,accent:o,unbounded:a,surface:c,foundationRef:p,...b}=t,{rootEl:l,surfaceEl:R}=F(t),u=s.Children.only(d);if(!s.isValidElement(u))return null;const x=!c||!a,h=a?{"data-mdc-ripple-is-unbounded":!0}:{},y=x?R.props({style:u.props.style}):{};let f=k.classNames(n!==u.props.className&&n,y.className,u.props.className,{"mdc-ripple-surface":typeof c=="boolean"?c:c===void 0,"mdc-ripple-surface--primary":i,"rmwc-ripple-surface--primary":i,"mdc-ripple-surface--accent":o,"rmwc-ripple-surface--accent":o});b.disabled&&(f=f.replace("mdc-ripple-upgraded--background-focused",""));const P=s.cloneElement(u,{ref:mergeRefs(u.ref, l.reactRef),...u.props,...h,...l.props({...b,style:u.props.style,...y,className:f})});return C.jsx(j.Provider,{value:R.props({style:u.props.style}),children:P})}const I=({className:t,...d})=>C.jsx(j.Consumer,{children:n=>C.jsx("div",{...d,...n,className:`${t} ${n.className||""}`})}),O=({unbounded:t,accent:d,surface:n}={})=>i=>{const o=s.forwardRef(({ripple:a,...c},p)=>{const b=B.useProviderContext();a=a??b.ripple;const l=typeof a!="object"?{}:a;return a?C.jsx(T,{...c,accent:l.accent||d,unbounded:l.unbounded||t,surface:l.surface||n,children:C.jsx(i,{...c,ref:p})}):C.jsx(i,{...c,ref:p})});return o.displayName=`withRipple(${i.displayName||i.constructor.name||"Unknown"})`,o};exports.Ripple=T;exports.RippleSurface=I;exports.withRipple=O;
diff --git a/index.mjs b/index.mjs
index 512d70fdda5ce91eeffcac4aad2cdabef8a4c6d4..18144a32d13cc6b7cccebbfcc1df0caa87865a57 100644
--- a/index.mjs
+++ b/index.mjs
@@ -96,6 +96,7 @@ const $ = (t) => {
t.disabled && n.handleBlur();
}, [t.disabled, n]), { ...i };
}, H = y.createContext({});
+var mergeRefs = function(a,b) { return function(el) { if (typeof a === 'function') a(el); else if (a && 'current' in a) a.current = el;if (typeof b === 'function') b(el); else if (b && 'current' in b) b.current = el}};
function j(t) {
const {
children: l,
@@ -126,8 +127,9 @@ function j(t) {
"mdc-ripple-upgraded--background-focused",
""
));
+
const E = y.cloneElement(c, {
- ref: d.reactRef,
+ ref: mergeRefs(c.ref, d.reactRef),
...c.props,
...b,
...d.props({

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
--- normalization.js 2024-02-06 17:49:25
+++ normalization-new.js 2024-02-06 17:49:20
@@ -446,7 +446,8 @@
diff --git a/lib/config/normalization.js b/lib/config/normalization.js
index a1acda77f74a70a90aee567af5bf7b7cf774eb3c..384952764a3820fadd30a11a520a7e3d5a5e3778 100644
--- a/lib/config/normalization.js
+++ b/lib/config/normalization.js
@@ -446,7 +446,8 @@ const getNormalizedWebpackOptions = config => {
hash: module.hash
})),
immutablePaths: optionalNestedArray(snapshot.immutablePaths, p => [...p]),
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@
"clear": "weboptimizer clear",
"document": "weboptimizer document",
"lint": "yarn clear && weboptimizer lint",
"patch": "for path in patches/*.patch; do target_file_path=\"$(echo \"$path\" | sed --regexp-extended 's/patches\\/([^/]+).patch$/\\1/' | sed 's:\\+:/:g')\"; source_file_path=\"$path\"; echo \"Patch file \\\"$target_file_path\\\" with \\\"$source_file_path\\\".\"; patch --forward --input \"$source_file_path\" --silent --reject-file - \"$target_file_path\"; done; true",
"prepare": "ln --force --symbolic react node_modules/@emotion/core && yarn build",
"postinstall": "yarn patch || true",
"postversion": "yarn publish --non-interactive; git push --tags && git push",
"serve": "weboptimizer serve",
"serve:minimal": "weboptimizer serve '{__reference__: \"target:minimal\"}'",
"start": "yarn serve",
Expand All @@ -105,7 +102,7 @@
"@rmwc/icon": "^14.0.11",
"@rmwc/icon-button": "^14.0.11",
"@rmwc/menu": "^14.0.11",
"@rmwc/select": "^14.0.11",
"@rmwc/select": "patch:@rmwc/select@npm%3A14.0.11#~/.yarn/patches/@rmwc-select-npm-14.0.11-9eb2618d5f.patch",
"@rmwc/tabs": "^14.0.11",
"@rmwc/textfield": "^14.0.11",
"@rmwc/theme": "^14.0.11",
Expand Down Expand Up @@ -284,7 +281,9 @@
"yarn": ">=4"
},
"resolutions": {
"colors": "1.4.0"
"colors": "1.4.0",
"@rmwc/ripple@npm:14.0.11": "patch:@rmwc/ripple@npm%3A14.0.11#~/.yarn/patches/@rmwc-ripple-npm-14.0.11-22d1530040.patch",
"webpack@npm:^5.90.3": "patch:webpack@npm%3A5.90.3#~/.yarn/patches/webpack-npm-5.90.3-2a12e60d26.patch"
},
"sideEffects": false,
"documentationWebsite": {
Expand Down
Empty file removed patches/.gitkeep
Empty file.
21 changes: 0 additions & 21 deletions patches/node_modules+@rmwc+ripple+index.mjs.patch

This file was deleted.

15 changes: 0 additions & 15 deletions patches/node_modules+@rmwc+select+index.mjs.patch

This file was deleted.

79 changes: 76 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3611,7 +3611,22 @@ __metadata:
languageName: node
linkType: hard

"@rmwc/select@npm:^14.0.11":
"@rmwc/ripple@patch:@rmwc/ripple@npm%3A14.0.11#~/.yarn/patches/@rmwc-ripple-npm-14.0.11-22d1530040.patch":
version: 14.0.11
resolution: "@rmwc/ripple@patch:@rmwc/ripple@npm%3A14.0.11#~/.yarn/patches/@rmwc-ripple-npm-14.0.11-22d1530040.patch::version=14.0.11&hash=51db23"
dependencies:
"@material/ripple": "npm:^14.0.0"
"@rmwc/base": "npm:14.0.11"
"@rmwc/provider": "npm:14.0.11"
"@rmwc/types": "npm:14.0.11"
peerDependencies:
react: ">=16.8.x"
react-dom: ">=16.8.x"
checksum: 10c0/5a8bbdc73b3f41f66cc1b3c3f3a0b272bec0fb91bf479662da587abd96209428bac31b1e802aab8cabcd2e9d0dad8bc411a3350f4bca3cc1d76ed3ec220f1ead
languageName: node
linkType: hard

"@rmwc/select@npm:14.0.11":
version: 14.0.11
resolution: "@rmwc/select@npm:14.0.11"
dependencies:
Expand All @@ -3632,6 +3647,27 @@ __metadata:
languageName: node
linkType: hard

"@rmwc/select@patch:@rmwc/select@npm%3A14.0.11#~/.yarn/patches/@rmwc-select-npm-14.0.11-9eb2618d5f.patch":
version: 14.0.11
resolution: "@rmwc/select@patch:@rmwc/select@npm%3A14.0.11#~/.yarn/patches/@rmwc-select-npm-14.0.11-9eb2618d5f.patch::version=14.0.11&hash=67c50a"
dependencies:
"@material/select": "npm:^14.0.0"
"@rmwc/base": "npm:14.0.11"
"@rmwc/floating-label": "npm:14.0.11"
"@rmwc/icon": "npm:14.0.11"
"@rmwc/line-ripple": "npm:14.0.11"
"@rmwc/list": "npm:14.0.11"
"@rmwc/menu": "npm:14.0.11"
"@rmwc/notched-outline": "npm:14.0.11"
"@rmwc/ripple": "npm:14.0.11"
"@rmwc/types": "npm:14.0.11"
peerDependencies:
react: ">=16.8.x"
react-dom: ">=16.8.x"
checksum: 10c0/ee4bfad25f80b31d70aedf350dad7bb2f40646065afa528afd0be8ee499c7cca16000bf6d75a6699f6ba036810101041828e28a9a878d2ab5fba15fe5cac7367
languageName: node
linkType: hard

"@rmwc/tabs@npm:^14.0.11":
version: 14.0.11
resolution: "@rmwc/tabs@npm:14.0.11"
Expand Down Expand Up @@ -12600,7 +12636,7 @@ __metadata:
"@rmwc/icon": "npm:^14.0.11"
"@rmwc/icon-button": "npm:^14.0.11"
"@rmwc/menu": "npm:^14.0.11"
"@rmwc/select": "npm:^14.0.11"
"@rmwc/select": "patch:@rmwc/select@npm%3A14.0.11#~/.yarn/patches/@rmwc-select-npm-14.0.11-9eb2618d5f.patch"
"@rmwc/tabs": "npm:^14.0.11"
"@rmwc/textfield": "npm:^14.0.11"
"@rmwc/theme": "npm:^14.0.11"
Expand Down Expand Up @@ -14837,7 +14873,7 @@ __metadata:
languageName: node
linkType: hard

"webpack@npm:^5.90.3":
"webpack@npm:5.90.3":
version: 5.90.3
resolution: "webpack@npm:5.90.3"
dependencies:
Expand Down Expand Up @@ -14874,6 +14910,43 @@ __metadata:
languageName: node
linkType: hard

"webpack@patch:webpack@npm%3A5.90.3#~/.yarn/patches/webpack-npm-5.90.3-2a12e60d26.patch":
version: 5.90.3
resolution: "webpack@patch:webpack@npm%3A5.90.3#~/.yarn/patches/webpack-npm-5.90.3-2a12e60d26.patch::version=5.90.3&hash=e75b41"
dependencies:
"@types/eslint-scope": "npm:^3.7.3"
"@types/estree": "npm:^1.0.5"
"@webassemblyjs/ast": "npm:^1.11.5"
"@webassemblyjs/wasm-edit": "npm:^1.11.5"
"@webassemblyjs/wasm-parser": "npm:^1.11.5"
acorn: "npm:^8.7.1"
acorn-import-assertions: "npm:^1.9.0"
browserslist: "npm:^4.21.10"
chrome-trace-event: "npm:^1.0.2"
enhanced-resolve: "npm:^5.15.0"
es-module-lexer: "npm:^1.2.1"
eslint-scope: "npm:5.1.1"
events: "npm:^3.2.0"
glob-to-regexp: "npm:^0.4.1"
graceful-fs: "npm:^4.2.9"
json-parse-even-better-errors: "npm:^2.3.1"
loader-runner: "npm:^4.2.0"
mime-types: "npm:^2.1.27"
neo-async: "npm:^2.6.2"
schema-utils: "npm:^3.2.0"
tapable: "npm:^2.1.1"
terser-webpack-plugin: "npm:^5.3.10"
watchpack: "npm:^2.4.0"
webpack-sources: "npm:^3.2.3"
peerDependenciesMeta:
webpack-cli:
optional: true
bin:
webpack: bin/webpack.js
checksum: 10c0/17cf0a091173656b6425a22da04cd053709b4418d9e92ffb968bc6d6f924dcb3b04e21f36a24040bafdf3aeb26a4ff25d00ed654d3514536878f040029b7b3d8
languageName: node
linkType: hard

"websocket-driver@npm:>=0.5.1, websocket-driver@npm:^0.7.4":
version: 0.7.4
resolution: "websocket-driver@npm:0.7.4"
Expand Down

0 comments on commit 973d502

Please sign in to comment.