fix(MdRipple): clear immediately (#1506)

VdustR · marcosmoura · commit d52954a34513 · 2018-02-14T17:35:55.000-02:00
* fix(MdRipple): clear immediately

* refactor(MdWave): rename wave end event

* fix(MdRipple): check disable

* fix(MdRipple): always reset active
diff --git a/src/components/MdRipple/MdRipple.vue b/src/components/MdRipple/MdRipple.vue
@@ -3,24 +3,23 @@
     :class="['md-ripple', rippleClasses]"
     @touchstart.passive.stop="touchStartCheck"
     @touchmove.passive.stop="touchMoveCheck"
-    @touchend.passive.stop="clearWave"
-    @mousedown.passive.stop="startRipple"
-    @mouseup.passive.stop="clearWave">
+    @mousedown.passive.stop="startRipple">
     <slot />
-
-    <transition-group name="md-ripple" v-if="!isDisabled">
-      <span v-for="(ripple, index) in ripples" :key="'ripple'+index" :class="['md-ripple-wave', waveClasses]" :style="ripple.waveStyles" />
-    </transition-group>
+    <md-wave v-for="ripple in ripples" :key="ripple.uuid" :class="['md-ripple-wave', waveClasses]" :style="ripple.waveStyles" @md-end="clearWave(ripple.uuid)" v-if="!isDisabled" />
   </div>
 </template>
 
 <script>
   import raf from 'raf'
   import MdComponent from 'core/MdComponent'
-  import debounce from 'core/utils/MdDebounce'
+  import uuid from 'core/utils/MdUuid'
+  import MdWave from './MdWave'
 
   export default new MdComponent({
     name: 'MdRipple',
+    components: {
+      MdWave
+    },
     props: {
       mdActive: null,
       mdDisabled: Boolean,
@@ -55,12 +54,11 @@
           this.startRipple({
             type: 'mousedown'
           })
-          this.$emit('update:mdActive', false)
         } else if (isEvent) {
           this.startRipple(active)
-          this.$emit('update:mdActive', false)
         }
-        this.clearWave()
+
+        this.$emit('update:mdActive', false)
       }
     },
     methods: {
@@ -88,8 +86,8 @@
 
             this.eventType = $event.type
             this.ripples.push({
-              animating: true,
-              waveStyles: this.applyStyles(position, size)
+              waveStyles: this.applyStyles(position, size),
+              uuid: uuid()
             })
           }
         })
@@ -103,9 +101,9 @@
           height: size
         }
       },
-      clearWave: debounce(function () {
-        this.ripples = []
-      }, 2000),
+      clearWave (uuid) {
+        uuid ? this.ripples = this.ripples.filter(ripple => ripple.uuid !== uuid) : this.ripples = []
+      },
       getSize () {
         const { offsetWidth, offsetHeight } = this.$el
 
@@ -169,18 +167,4 @@
       z-index: 2;
     }
   }
-
-  .md-ripple-enter-active {
-    transition: .8s $md-transition-stand-timing;
-    transition-property: opacity, transform;
-    will-change: opacity, transform;
-    &.md-centered {
-      transition-duration: 1.2s;
-    }
-  }
-
-  .md-ripple-enter {
-    opacity: .26;
-    transform: scale(.26) translateZ(0);
-  }
 </style>
diff --git a/src/components/MdRipple/MdWave.vue b/src/components/MdRipple/MdWave.vue
@@ -0,0 +1,45 @@
+<template>
+  <transition name="md-ripple" @after-enter="end">
+    <span v-if="animating" />
+  </transition>
+</template>
+
+<script>
+  import MdComponent from 'core/MdComponent'
+  export default new MdComponent({
+    name: 'MdWave',
+    data () {
+      return {
+        animating: true
+      }
+    },
+    props: {
+      waveClasses: null,
+      waveStyles: null
+    },
+    methods: {
+      end () {
+        this.animating = null
+        this.$emit('md-end')
+      }
+    }
+  })
+</script>
+
+<style lang="scss">
+  @import "~components/MdAnimation/variables";
+
+  .md-ripple-enter-active {
+    transition: .8s $md-transition-stand-timing;
+    transition-property: opacity, transform;
+    will-change: opacity, transform;
+    &.md-centered {
+      transition-duration: 1.2s;
+    }
+  }
+
+  .md-ripple-enter {
+    opacity: .26;
+    transform: scale(.26) translateZ(0);
+  }
+</style>
diff --git a/src/components/MdRipple/index.js b/src/components/MdRipple/index.js
@@ -1,7 +1,9 @@
 import material from 'vue-material/material'
 import MdRipple from './MdRipple'
+import MdWave from './MdWave'
 
 export default Vue => {
   material(Vue)
   Vue.component(MdRipple.name, MdRipple)
+  Vue.component(MdWave.name, MdWave)
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`import material from 'vue-material/material'`
`2`	`2`	`import MdRipple from './MdRipple'`
	`3`	`+import MdWave from './MdWave'`
`3`	`4`
`4`	`5`	`export default Vue => {`
`5`	`6`	`material(Vue)`
`6`	`7`	`Vue.component(MdRipple.name, MdRipple)`
	`8`	`+ Vue.component(MdWave.name, MdWave)`
`7`	`9`	`}`