From 7867b0113eded2bf76ddaa7983496d9ac889f1a9 Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Sun, 25 Mar 2018 22:52:48 +0200
Subject: [PATCH] Rename buttons to feature

---
 .../client/components/Editor.js               | 10 ++---
 .../client/components/rte/RTE.js              | 42 ++++++++++---------
 .../rte/{buttons => features}/Blockquote.js   |  0
 .../rte/{buttons => features}/Bold.js         |  0
 .../rte/{buttons => features}/Italic.js       |  0
 .../rte/{buttons => features}/index.js        |  0
 6 files changed, 27 insertions(+), 25 deletions(-)
 rename plugins/talk-plugin-rich-text/client/components/rte/{buttons => features}/Blockquote.js (100%)
 rename plugins/talk-plugin-rich-text/client/components/rte/{buttons => features}/Bold.js (100%)
 rename plugins/talk-plugin-rich-text/client/components/rte/{buttons => features}/Italic.js (100%)
 rename plugins/talk-plugin-rich-text/client/components/rte/{buttons => features}/index.js (100%)

diff --git a/plugins/talk-plugin-rich-text/client/components/Editor.js b/plugins/talk-plugin-rich-text/client/components/Editor.js
index b273799b5..e09931d38 100644
--- a/plugins/talk-plugin-rich-text/client/components/Editor.js
+++ b/plugins/talk-plugin-rich-text/client/components/Editor.js
@@ -6,7 +6,7 @@ import { PLUGIN_NAME } from '../constants';
 import { htmlNormalizer } from '../utils';
 import RTE from './rte/RTE';
 import { Icon } from 'plugin-api/beta/client/components/ui';
-import { Bold, Italic, Blockquote } from './rte/buttons';
+import { Bold, Italic, Blockquote } from './rte/features';
 import { t } from 'plugin-api/beta/client/services';
 
 class Editor extends React.Component {
@@ -75,25 +75,25 @@ class Editor extends React.Component {
           disabled={disabled}
           placeholder={placeholder}
           ref={this.handleRef}
-          buttons={[
+          features={[
             <Bold
               key="bold"
               title={t('talk-plugin-rich-text.format_bold')}
-              className={`${PLUGIN_NAME}-button-bold`}
+              className={`${PLUGIN_NAME}-feature-bold`}
             >
               <Icon className={styles.icon} name="format_bold" />
             </Bold>,
             <Italic
               key="italic"
               title={t('talk-plugin-rich-text.format_italic')}
-              className={`${PLUGIN_NAME}-button-italic`}
+              className={`${PLUGIN_NAME}-feature-italic`}
             >
               <Icon className={styles.icon} name="format_italic" />
             </Italic>,
             <Blockquote
               key="blockquote"
               title={t('talk-plugin-rich-text.format_blockquote')}
-              className={`${PLUGIN_NAME}-button-blockquote`}
+              className={`${PLUGIN_NAME}-feature-blockquote`}
             >
               <Icon className={styles.icon} name="format_quote" />
             </Blockquote>,
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/RTE.js b/plugins/talk-plugin-rich-text/client/components/rte/RTE.js
index e919a86ef..ba4bf98bd 100644
--- a/plugins/talk-plugin-rich-text/client/components/rte/RTE.js
+++ b/plugins/talk-plugin-rich-text/client/components/rte/RTE.js
@@ -38,8 +38,8 @@ class RTE extends React.Component {
   // Instance of undo stack.
   undo = new Undo();
 
-  // Refs to the buttons.
-  buttonsRef = {};
+  // Refs to the features.
+  featuresRef = {};
 
   // Export this for parent components.
   focus = () => this.ref.htmlEl.focus();
@@ -63,13 +63,13 @@ class RTE extends React.Component {
     this.saveCheckpoint(props.value);
   }
 
-  // Returns a handler that fills our `buttonsRef`.
-  createButtonRefHandler(key) {
+  // Returns a handler that fills our `featuresRef`.
+  createFeatureRefHandler(key) {
     return ref => {
       if (ref) {
-        this.buttonsRef[key] = ref;
+        this.featuresRef[key] = ref;
       } else {
-        delete this.buttonsRef[key];
+        delete this.featuresRef[key];
       }
     };
   }
@@ -77,8 +77,8 @@ class RTE extends React.Component {
   // Ref to react-contenteditable.
   handleRef = ref => (this.ref = ref);
 
-  forEachButton(callback) {
-    Object.keys(this.buttonsRef).map(k => callback(this.buttonsRef[k]));
+  forEachFeature(callback) {
+    Object.keys(this.featuresRef).map(k => callback(this.featuresRef[k]));
   }
 
   componentWillReceiveProps(props) {
@@ -119,17 +119,17 @@ class RTE extends React.Component {
   };
 
   handleSelectionChange = () => {
-    // Let buttons know selection has changeed, so they
+    // Let features know selection has changeed, so they
     // can update.
-    this.forEachButton(b => {
+    this.forEachFeature(b => {
       b.onSelectionChange && b.onSelectionChange();
     });
   };
 
-  // Allow buttons to handle shortcuts.
+  // Allow features to handle shortcuts.
   handleShortcut = e => {
     let handled = false;
-    this.forEachButton(b => {
+    this.forEachFeature(b => {
       if (!handled) {
         handled = !!(b.onShortcut && b.onShortcut(e));
       }
@@ -139,14 +139,14 @@ class RTE extends React.Component {
 
   // Called when Enter was pressed without shift.
   // Traverses from bottom to top and calling
-  // button handlers and stops when one has handled this event.
+  // feature handlers and stops when one has handled this event.
   handleSpecialEnter = () => {
     let handled = false;
     const sel = window.getSelection();
     const range = sel.getRangeAt(0);
     let container = range.startContainer;
     while (!handled && container && container !== this.ref.htmlEl) {
-      this.forEachButton(b => {
+      this.forEachFeature(b => {
         if (!handled) {
           handled = !!(b.onEnter && b.onEnter(container));
         }
@@ -309,12 +309,12 @@ class RTE extends React.Component {
     }
   }
 
-  renderButtons() {
-    return this.props.buttons.map(b => {
+  renderFeatures() {
+    return this.props.features.map(b => {
       return React.cloneElement(b, {
         disabled: this.props.disabled,
         api: this.api,
-        ref: this.createButtonRefHandler(b.key),
+        ref: this.createFeatureRefHandler(b.key),
       });
     });
   }
@@ -346,7 +346,9 @@ class RTE extends React.Component {
 
     return (
       <div className={classNames.root}>
-        <Toolbar className={classNames.toolbar}>{this.renderButtons()}</Toolbar>
+        <Toolbar className={classNames.toolbar}>
+          {this.renderFeatures()}
+        </Toolbar>
         {!value && <div className={classNames.placeholder}>{placeholder}</div>}
         <ContentEditable
           id={inputId}
@@ -371,11 +373,11 @@ class RTE extends React.Component {
 }
 
 RTE.defaultProps = {
-  buttons: [],
+  features: [],
 };
 
 RTE.propTypes = {
-  buttons: PropTypes.array,
+  features: PropTypes.array,
   inputId: PropTypes.string,
   input: PropTypes.object,
   onChange: PropTypes.func,
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/buttons/Blockquote.js b/plugins/talk-plugin-rich-text/client/components/rte/features/Blockquote.js
similarity index 100%
rename from plugins/talk-plugin-rich-text/client/components/rte/buttons/Blockquote.js
rename to plugins/talk-plugin-rich-text/client/components/rte/features/Blockquote.js
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/buttons/Bold.js b/plugins/talk-plugin-rich-text/client/components/rte/features/Bold.js
similarity index 100%
rename from plugins/talk-plugin-rich-text/client/components/rte/buttons/Bold.js
rename to plugins/talk-plugin-rich-text/client/components/rte/features/Bold.js
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/buttons/Italic.js b/plugins/talk-plugin-rich-text/client/components/rte/features/Italic.js
similarity index 100%
rename from plugins/talk-plugin-rich-text/client/components/rte/buttons/Italic.js
rename to plugins/talk-plugin-rich-text/client/components/rte/features/Italic.js
diff --git a/plugins/talk-plugin-rich-text/client/components/rte/buttons/index.js b/plugins/talk-plugin-rich-text/client/components/rte/features/index.js
similarity index 100%
rename from plugins/talk-plugin-rich-text/client/components/rte/buttons/index.js
rename to plugins/talk-plugin-rich-text/client/components/rte/features/index.js