Merge pull request #197 from a-kriya/noprop

Use showDeletion and showEdition from store

Author: mattmezza

demo/src/App.vue

@@ -4,7 +4,7 @@
       :chosenColor="chosenColor"
       :colors="colors"
     />
-    <beautiful-chat 
+    <beautiful-chat
       :alwaysScrollToBottom="alwaysScrollToBottom"
       :close="closeChat"
       :colors="colors"
@@ -35,7 +35,7 @@
           👍
         </button>
       </template>
-      <template v-slot:text-message-body="scopedProps"> 
+      <template v-slot:text-message-body="scopedProps">
         <p class="sc-message--text-content" v-html="scopedProps.messageText"></p>
         <p v-if="scopedProps.message.data.meta" class='sc-message--meta' :style="{color: scopedProps.messageColors.color}">{{scopedProps.message.data.meta}}</p>
         <p v-if="scopedProps.message.isEdited || scopedProps.message.liked" class='sc-message--edited'>

src/ChatWindow.vue

@@ -19,8 +19,6 @@
       :show-typing-indicator="showTypingIndicator"
       :colors="colors"
       :always-scroll-to-bottom="alwaysScrollToBottom"
-      :show-edition="showEdition"
-      :show-deletion="showDeletion"
       :show-confirmation-deletion="showConfirmationDeletion"
       :confirmation-deletion-message="confirmationDeletionMessage"
       :message-styling="messageStyling"
@@ -128,14 +126,6 @@ export default {
       type: Boolean,
       required: true
     },
-    showEdition: {
-      type: Boolean,
-      required: true
-    },
-    showDeletion: {
-      type: Boolean,
-      required: true
-    },
     showConfirmationDeletion: {
       type: Boolean,
       required: true

src/Launcher.vue

@@ -21,8 +21,6 @@
       :is-open="isOpen"
       :show-emoji="showEmoji"
       :show-file="showFile"
-      :show-edition="showEdition"
-      :show-deletion="showDeletion"
       :show-confirmation-deletion="showConfirmationDeletion"
       :confirmation-deletion-message="confirmationDeletionMessage"
       :show-header="showHeader"
@@ -245,7 +243,6 @@ export default {
       deep: true,
       immediate: true,
       handler(props) {
-        // TODO: optimize
         for (const prop in props) {
           store.setState(prop, props[prop])
         }

src/Message.vue

@@ -25,8 +25,6 @@
         :message="message"
         :message-colors="messageColors"
         :message-styling="messageStyling"
-        :show-edition="showEdition"
-        :show-deletion="showDeletion"
         :show-confirmation-deletion="showConfirmationDeletion"
         :confirmation-deletion-message="confirmationDeletionMessage"
         @remove="$emit('remove')"
@@ -97,14 +95,6 @@ export default {
       type: Object,
       required: true
     },
-    showEdition: {
-      type: Boolean,
-      required: true
-    },
-    showDeletion: {
-      type: Boolean,
-      required: true
-    },
     showConfirmationDeletion: {
       type: Boolean,
       required: true

src/MessageList.vue

@@ -12,8 +12,6 @@
       :user="profile(message.author)"
       :colors="colors"
       :message-styling="messageStyling"
-      :show-edition="showEdition"
-      :show-deletion="showDeletion"
       :show-confirmation-deletion="showConfirmationDeletion"
       :confirmation-deletion-message="confirmationDeletionMessage"
       @remove="$emit('remove', message)"
@@ -45,8 +43,6 @@
       :user="profile(showTypingIndicator)"
       :colors="colors"
       :message-styling="messageStyling"
-      :show-edition="showEdition"
-      :show-deletion="showDeletion"
       :show-confirmation-deletion="showConfirmationDeletion"
       :confirmation-deletion-message="confirmationDeletionMessage"
     />
@@ -86,14 +82,6 @@ export default {
       type: Boolean,
       required: true
     },
-    showEdition: {
-      type: Boolean,
-      required: true
-    },
-    showDeletion: {
-      type: Boolean,
-      required: true
-    },
     showConfirmationDeletion: {
       type: Boolean,
       required: true

src/messages/TextMessage.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script>
+import {mapState} from '../store/'
 import IconBase from './../components/IconBase.vue'
 import IconEdit from './../components/icons/IconEdit.vue'
 import IconCross from './../components/icons/IconCross.vue'
@@ -70,14 +71,6 @@ export default {
       type: Boolean,
       required: true
     },
-    showEdition: {
-      type: Boolean,
-      required: true
-    },
-    showDeletion: {
-      type: Boolean,
-      required: true
-    },
     showConfirmationDeletion: {
       type: Boolean,
       required: true
@@ -101,7 +94,8 @@ export default {
     },
     isEditing() {
       return (store.state.editMessage && store.state.editMessage.id) === this.message.id
-    }
+    },
+    ...mapState(['showDeletion', 'showEdition'])
   },
   methods: {
     edit() {