fix: Text, stroke and fill palettes not showing with custom buttons [P…

…T-182016906]

This adds code to also load the palette buttons when the text, stroke and fill tools are used in the custom button settings.

NOTE: Although this is a bugfix there was already a 2.3.0-pre.1 package on npm so I had to use a minor version upgrade instead of a bugfix semver bump.

app/scripts/ui/ui-manager.js

@@ -33,10 +33,18 @@ function UIManager(drawingTool) {
       const addLineButtons = button === 'linesPalette';
       const addStampButtons = button === 'stamp';
       const addShapeButtons = button === 'shapesPalette';
+      const addFontSizeButtons = button === 'text';
+      const addStrokeColorButtons = button === 'strokeColorPalette';
+      const addStrokeWidthButtons = button === 'strokeWidthPalette';
+      const addFillColorButtons = button === 'fillColorPalette';
       uiDef.buttons.forEach(buttonDef => {
         const addButtonDef = (buttonDef.name === button) ||
           (addLineButtons && buttonDef.palette === 'lines') ||
           (addShapeButtons && buttonDef.palette === 'shapes') ||
+          (addFontSizeButtons && buttonDef.palette === 'fontSizes') ||
+          (addStrokeColorButtons && buttonDef.palette === 'strokeColors') ||
+          (addStrokeWidthButtons && buttonDef.palette === 'strokeWidths') ||
+          (addFillColorButtons && buttonDef.palette === 'fillColors') ||
           (addStampButtons && ((buttonDef.palette === 'stampCategories') || (buttonDef.palette.indexOf('StampsPalette') >= 0)));
         if (addButtonDef) {
           customButtonDefs.push(buttonDef);

dist/examples/custom-button-order.html

@@ -41,6 +41,14 @@
         'free',
         'shapesPalette',
         'stamp',
+        'text',
+        'linesPalette',
+        'strokeColorPalette',
+        'fillColorPalette',
+        'strokeWidthPalette',
+        'clone',
+        'sendToBack',
+        'sendToFront',
         'annotation',
         'trash'
       ]

package.json

@@ -2,7 +2,7 @@
   "name": "drawing-tool",
   "description": "HTML5 Drawing Tool",
   "author": "",
-  "version": "2.3.0-pre.1",
+  "version": "2.3.0",
   "bugs": {
     "url": "https://github.com/concord-consortium/drawing-tool/issues"
   },

public/examples/custom-button-order.html

@@ -41,6 +41,14 @@
         'free',
         'shapesPalette',
         'stamp',
+        'text',
+        'linesPalette',
+        'strokeColorPalette',
+        'fillColorPalette',
+        'strokeWidthPalette',
+        'clone',
+        'sendToBack',
+        'sendToFront',
         'annotation',
         'trash'
       ]