@dreamworld/dw-ripple 2.5.0 → 2.6.0-ripple-rendring-not-cencel-on-pointer-move.1

package/.circleci/config.yml

@@ -1,48 +1,11 @@
 version: 2
 jobs:
-  merge-to-development:
-    machine: true
-    steps:
-      - run:
-          name: Clone Repository
-          working_directory: ~/workdir
-          command: |
-            echo "PR IS::"
-            echo $CIRCLE_PULL_REQUEST
-            if [[ -n ${CIRCLE_PULL_REQUEST} ]]
-            then
-              git clone https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git  my-repo
-            else
-              echo "No PR Attached, so not doing anything"
-            fi
-      - run:
-          name: Merge PR branch to development
-          working_directory: ~/workdir/my-repo
-          command: |
-            if [[ -n ${CIRCLE_PULL_REQUEST} ]]
-            then
-              # circleci has 2.14.x as of now!
-              git --version
-              git config credential.helper 'cache --timeout=120'
-              git config user.email "dw-devops@dreamworld.solutions"
-              git config user.name "DW Devops"
-              git remote set-url --push origin https://${GH_TOKEN}@github.com/DreamworldSolutions/$CIRCLE_PROJECT_REPONAME.git
-              (git checkout -b feature/development origin/master || true)
-              (git pull origin feature/development || true)
-              git merge origin/$CIRCLE_BRANCH --no-ff --no-edit
-              git push origin feature/development
-              # Push quietly to prevent showing the token in log
-              git push -q origin feature/development
-            else
-              echo "No PR Attached, so not doing anything."
-            fi
-            
   release-snapshot:
     docker:
-      - image: circleci/node:14
+      - image: circleci/node:lts
     steps:
       - checkout
-      - run: yarn install --frozen-lockfile --non-interactive
+      - run: yarn install --frozen-lockfile --non-ineractive
       - run:
           name: Deploy
           command: |
@@ -51,27 +14,17 @@ jobs:
             npx semantic-release
   release:
     docker:
-      - image: circleci/node:14
+      - image: circleci/node:lts
     steps:
       - checkout
-      - run: yarn install --frozen-lockfile --non-interactive
+      - run: yarn install --frozen-lockfile --non-ineractive
       - run: echo "Running release job"
       - run:
           name: Deploy
           command: npx semantic-release
 
-
 workflows:
   version: 2
-  merge-to-development:
-    jobs:
-      - merge-to-development:
-          context: Dreamworld
-          filters:
-            branches:
-              ignore:
-                - master
-                - feature/development
   release:
     jobs:
       - release-snapshot:
@@ -79,10 +32,10 @@ workflows:
           filters:
             branches:
               only:
-                - feature/development
+                - /^feature\/.+$/
       - release:
           context: Dreamworld
           filters:
-              branches:
-                only:
-                  - master
+            branches:
+              only:
+                - master

package/dw-ripple.js

@@ -9,8 +9,20 @@ export class DwRipple extends Ripple {
     return [
       super.styles,
       css`
+        :host([disabled]) {
+          --mdc-theme-on-surface: transparent;
+        }
+
+        :host([primary]) {
+          --mdc-theme-on-surface: var(--mdc-theme-primary);
+        }
+
         :host([secondary]) {
-          --mdc-ripple-color: var(--mdc-theme-secondary);
+          --mdc-theme-on-surface: var(--mdc-theme-secondary);
+        }
+        
+        .mdc-ripple-surface::before, .mdc-ripple-surface::after {
+          background-color: var(--mdc-theme-on-surface, #000);
         }
       `,
     ];
@@ -66,37 +78,45 @@ export class DwRipple extends Ripple {
   }
 
   __onMouseDown(e) {
+    console.debug("onMouseDown", e);
     this._timeoutRippleOnMouseDown = setTimeout(() => {
+      console.log("timeoutRippleOnMouseDown");
       window.addEventListener("mouseup", this.__onMouseUp);
       this._rippleHander.startPress(e);
     }, 50);
   }
 
   __onTouchStart(e) {
+    console.debug("onTouchStart", e);
     this._timeoutRippleOnTouchStart = setTimeout(() => {
+      console.debug("timeoutRippleOnTouchStart");
       window.addEventListener("touchend", this.__onTouchEnd);
       this._rippleHander.startPress(e);
     }, 50);
   }
 
   __onPointerMove() {
+    console.debug("onPointerMove");
     if (this._timeoutRippleOnMouseDown) {
       clearTimeout(this._timeoutRippleOnMouseDown);
     }
   }
 
   __onTouchMove() {
+    console.debug("onTouchMove");
     if (this._timeoutRippleOnTouchStart) {
       clearTimeout(this._timeoutRippleOnTouchStart);
     }
   }
 
   __onMouseUp() {
+    console.debug("onMouseUp");
     window.removeEventListener("mouseup", this.__onMouseUp);
     this._rippleHander.endPress();
   }
 
   __onTouchEnd() {
+    console.debug("onTouchEnd");
     window.removeEventListener("touchend", this.__onTouchEnd);
     this._rippleHander.endPress();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamworld/dw-ripple",
-  "version": "2.5.0",
+  "version": "2.6.0-ripple-rendring-not-cencel-on-pointer-move.1",
   "description": "Ripple element created as child-class of [`mwc-ripple`] (https://github.com/material-components/material-components-web-components/tree/master/packages/ripple)",
   "main": "dw-ripple.js",
   "scripts": {