goblin-laboratory 4.2.13 → 4.3.0

package/lib/carnotzet.js

@@ -30,6 +30,9 @@ const logicHandlers = {
     }
     return state.set('rootId', widgetId).set('root', widget);
   },
+  'change-theme': (state, action) => {
+    return state.set('theme', action.get('name'));
+  },
 };
 
 // Register quest's according rc.json
@@ -102,6 +105,10 @@ Goblin.registerQuest(goblinName, 'when-ui-crash', function (
   );
 });
 
+Goblin.registerQuest(goblinName, 'change-theme', function (quest, name) {
+  quest.do({name});
+});
+
 Goblin.registerQuest(goblinName, 'delete', function* (quest) {
   quest.log.info(`Deleting carnotzet`);
   const state = quest.goblin.getState();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-laboratory",
-  "version": "4.2.13",
+  "version": "4.3.0",
   "description": "Laboratory",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/widgets/widget/style/merge-style-definitions.js

@@ -33,6 +33,9 @@ export default function mergeStyleDefinitions(styleDefs) {
     mapProps: (props, theme) =>
       mapPropsList.reduce((p, mapProps) => mapProps(p, theme), props),
     func: (theme, props) =>
-      funcList.reduce((styles, func) => func.bind({styles})(theme, props), {}),
+      funcList.reduce(
+        (styles, func) => ({...styles, ...func.bind({styles})(theme, props)}),
+        {}
+      ),
   };
 }