goblin-laboratory 2.2.1 → 2.2.2

package/widgets/store/widgets-reducer.js

@@ -1,95 +1,95 @@
-import {fromJS} from 'immutable';
-import importer from 'goblin_importer';
-import Shredder from 'xcraft-core-shredder';
-
-const reducerImporter = importer('reducer');
-const wrappedReducers = {};
-
-const actionTypePrefix = '@widgets_';
-const findReducerNameRegex = /\$([^@]*)/;
-
-const wrapReducer = (reducer) => (state, action) => {
-  if (state) {
-    state = new Shredder(state);
-  }
-  const nState = reducer(state, action);
-  if (Shredder.isShredder(nState)) {
-    return nState.state;
-  }
-  return nState;
-};
-
-function findReducerName(action) {
-  const matches = action._id.match(findReducerNameRegex);
-  if (!matches || !matches[1]) {
-    throw new Error(
-      `Unable to find a reducer name for action: ${JSON.stringify(action)}`
-    );
-  }
-  return matches[1];
-}
-
-function getWrappedReducer(reducerName) {
-  let wrappedReducer = wrappedReducers[reducerName];
-  if (!wrappedReducer) {
-    const reducer = reducerImporter(reducerName);
-    if (!reducer) {
-      return null;
-    }
-    wrappedReducer = wrapReducer(reducer);
-    wrappedReducers[reducerName] = wrappedReducer;
-  }
-  return wrappedReducer;
-}
-
-function getReducerForAction(action) {
-  if (action._type) {
-    const reducer = getWrappedReducer(action._type);
-    if (reducer) {
-      return reducer;
-    }
-  }
-
-  const reducerName = findReducerName(action);
-  const reducer = getWrappedReducer(reducerName);
-  if (reducer) {
-    return reducer;
-  }
-
-  throw new Error(
-    `No reducer named "${reducerName}" found. Action:\n${JSON.stringify(
-      action
-    )}`
-  );
-}
-
-export default (state = fromJS({}), action = {}) => {
-  if (action.type === 'FIELD-CHANGED' && action.path.startsWith('widgets.')) {
-    const path = action.path.split('.').slice(1);
-    return state.setIn(path, action.value);
-  }
-
-  if (action.type === 'WIDGETS_COLLECT') {
-    action.ids.forEach((id) => {
-      state = state.delete(id);
-    });
-    return state;
-  }
-
-  if (!action.type.startsWith(actionTypePrefix)) {
-    return state;
-  }
-
-  const wrappedReducer = getReducerForAction(action);
-
-  // Remove type prefix
-  action = {
-    ...action,
-    type: action.type.substring(actionTypePrefix.length),
-  };
-
-  const id = action._id;
-  let _state = state.get(id, undefined);
-  _state = wrappedReducer(_state, action);
-  return state.set(id, _state);
-};
+import {fromJS} from 'immutable';
+import importer from 'goblin_importer';
+import Shredder from 'xcraft-core-shredder';
+
+const reducerImporter = importer('reducer');
+const wrappedReducers = {};
+
+const actionTypePrefix = '@widgets_';
+const findReducerNameRegex = /\$([^@]*)/;
+
+const wrapReducer = (reducer) => (state, action) => {
+  if (state) {
+    state = new Shredder(state);
+  }
+  const nState = reducer(state, action);
+  if (Shredder.isShredder(nState)) {
+    return nState.state;
+  }
+  return nState;
+};
+
+function findReducerName(action) {
+  const matches = action._id.match(findReducerNameRegex);
+  if (!matches || !matches[1]) {
+    throw new Error(
+      `Unable to find a reducer name for action: ${JSON.stringify(action)}`
+    );
+  }
+  return matches[1];
+}
+
+function getWrappedReducer(reducerName) {
+  let wrappedReducer = wrappedReducers[reducerName];
+  if (!wrappedReducer) {
+    const reducer = reducerImporter(reducerName);
+    if (!reducer) {
+      return null;
+    }
+    wrappedReducer = wrapReducer(reducer);
+    wrappedReducers[reducerName] = wrappedReducer;
+  }
+  return wrappedReducer;
+}
+
+function getReducerForAction(action) {
+  if (action._type) {
+    const reducer = getWrappedReducer(action._type);
+    if (reducer) {
+      return reducer;
+    }
+  }
+
+  const reducerName = findReducerName(action);
+  const reducer = getWrappedReducer(reducerName);
+  if (reducer) {
+    return reducer;
+  }
+
+  throw new Error(
+    `No reducer named "${reducerName}" found. Action:\n${JSON.stringify(
+      action
+    )}`
+  );
+}
+
+export default (state = fromJS({}), action = {}) => {
+  if (action.type === 'FIELD-CHANGED' && action.path.startsWith('widgets.')) {
+    const path = action.path.split('.').slice(1);
+    return state.setIn(path, action.value);
+  }
+
+  if (action.type === 'WIDGETS_COLLECT') {
+    action.ids.forEach((id) => {
+      state = state.delete(id);
+    });
+    return state;
+  }
+
+  if (!action.type.startsWith(actionTypePrefix)) {
+    return state;
+  }
+
+  const wrappedReducer = getReducerForAction(action);
+
+  // Remove type prefix
+  action = {
+    ...action,
+    type: action.type.substring(actionTypePrefix.length),
+  };
+
+  const id = action._id;
+  let _state = state.get(id, undefined);
+  _state = wrappedReducer(_state, action);
+  return state.set(id, _state);
+};

package/widgets/theme-context/js-to-css.js

@@ -1,20 +1,20 @@
-import toCss from 'obj-to-css';
-import cssKey from 'css-key';
-
-export default function jsToCSS(jsStyles) {
-  return toCss(
-    Object.assign(
-      {},
-      ...Object.keys(jsStyles).map((className) => {
-        return {
-          [cssKey(className)]: Object.assign(
-            {},
-            ...Object.keys(jsStyles[className]).map((key) => {
-              return {[cssKey(key)]: jsStyles[className][key]};
-            })
-          ),
-        };
-      })
-    )
-  );
-}
+import toCss from 'obj-to-css';
+import cssKey from 'css-key';
+
+export default function jsToCSS(jsStyles) {
+  return toCss(
+    Object.assign(
+      {},
+      ...Object.keys(jsStyles).map((className) => {
+        return {
+          [cssKey(className)]: Object.assign(
+            {},
+            ...Object.keys(jsStyles[className]).map((key) => {
+              return {[cssKey(key)]: jsStyles[className][key]};
+            })
+          ),
+        };
+      })
+    )
+  );
+}

package/widgets/theme-context/widget.js

@@ -1,130 +1,130 @@
-//T:2019-02-27
-import React from 'react';
-import Widget from 'goblin-laboratory/widgets/widget';
-import PropTypes from 'prop-types';
-import importer from 'goblin_importer';
-import jsToCSS from './js-to-css.js';
-
-const themeContextImporter = importer('theme-context');
-
-class ThemeContext extends Widget {
-  constructor() {
-    super(...arguments);
-    this._theme = null;
-  }
-
-  getChildContext() {
-    return {
-      theme: this._theme,
-      themeContextName: this.props.themeContext,
-    };
-  }
-
-  static get childContextTypes() {
-    return {
-      theme: PropTypes.object,
-      themeContextName: PropTypes.string,
-    };
-  }
-
-  build(themeContext) {
-    let theme = this.props.theme ? this.props.theme.toJS() : null;
-    if (!theme) {
-      return null;
-    }
-
-    const themesGen = this.props.themesGen;
-    const themeGen = themesGen ? themesGen.get(this.props.currentTheme, 1) : 1;
-    theme.cacheName = `${theme.name}-${themeGen}`;
-
-    const {
-      colors = theme.colors,
-      spacing = theme.spacing,
-      timing = theme.timing,
-      look = theme.look,
-      paletteBuilder,
-      shapesBuilder,
-      stylesBuilder,
-      transitionsBuilder,
-      typoBuilder,
-    } = themeContext.builders[theme.builder];
-
-    const palette = paletteBuilder(colors);
-    const shapes = shapesBuilder(spacing, colors);
-    const transitions = transitionsBuilder(timing);
-    const typo = typoBuilder(spacing);
-
-    const styles = stylesBuilder({
-      colors: colors,
-      palette,
-      shapes,
-      spacing: spacing,
-      timing: timing,
-      transitions,
-      typo,
-      look: look,
-    });
-
-    return {
-      ...theme,
-      styles,
-      palette,
-      shapes,
-      transitions,
-      typo,
-    };
-  }
-
-  render() {
-    if (!this.props.theme) {
-      return null;
-    }
-    const themeContext = themeContextImporter(this.props.themeContext);
-    this._theme = this.build(themeContext);
-    if (!this._theme) {
-      return null;
-    }
-    const globalStyles = themeContext.getGlobalStyles(this._theme);
-    if (this.props.frameThemeContext && globalStyles['.root']) {
-      globalStyles[`.root-${this.props.labId.replace(/@/g, '-')}`] =
-        globalStyles['.root'];
-      delete globalStyles['.root'];
-    }
-    const fonts = themeContext.getFonts(this._theme);
-
-    return (
-      // The `key` prop forces all children to be recreated when the theme changes
-      // Changing the (legacy) context is not sufficient to redraw the children
-      <React.Fragment key={this._theme.cacheName}>
-        {/* // This <style> is not necessary without shadow dom and causes errors in aphrodite after unmount and remount */}
-        {/* <style type="text/css" data-aphrodite /> */}
-        {globalStyles && (
-          <style
-            type="text/css"
-            dangerouslySetInnerHTML={{__html: jsToCSS(globalStyles)}}
-          />
-        )}
-        {fonts && (
-          <style type="text/css" dangerouslySetInnerHTML={{__html: fonts}} />
-        )}
-        {this.props.children}
-      </React.Fragment>
-    );
-  }
-}
-
-export default Widget.connect((state, props) => {
-  const {labId, themeContext, currentTheme} = props;
-  const themesGen = state.get(`backend.${labId}.themesGen`);
-
-  if (!state.has(`backend.theme-composer@${themeContext}`)) {
-    console.warn(`theme context "${themeContext}" is missing`);
-  }
-
-  return {
-    theme: state.get(
-      `backend.theme-composer@${themeContext}.themes.${currentTheme}`
-    ),
-    themesGen,
-  };
-})(ThemeContext);
+//T:2019-02-27
+import React from 'react';
+import Widget from 'goblin-laboratory/widgets/widget';
+import PropTypes from 'prop-types';
+import importer from 'goblin_importer';
+import jsToCSS from './js-to-css.js';
+
+const themeContextImporter = importer('theme-context');
+
+class ThemeContext extends Widget {
+  constructor() {
+    super(...arguments);
+    this._theme = null;
+  }
+
+  getChildContext() {
+    return {
+      theme: this._theme,
+      themeContextName: this.props.themeContext,
+    };
+  }
+
+  static get childContextTypes() {
+    return {
+      theme: PropTypes.object,
+      themeContextName: PropTypes.string,
+    };
+  }
+
+  build(themeContext) {
+    let theme = this.props.theme ? this.props.theme.toJS() : null;
+    if (!theme) {
+      return null;
+    }
+
+    const themesGen = this.props.themesGen;
+    const themeGen = themesGen ? themesGen.get(this.props.currentTheme, 1) : 1;
+    theme.cacheName = `${theme.name}-${themeGen}`;
+
+    const {
+      colors = theme.colors,
+      spacing = theme.spacing,
+      timing = theme.timing,
+      look = theme.look,
+      paletteBuilder,
+      shapesBuilder,
+      stylesBuilder,
+      transitionsBuilder,
+      typoBuilder,
+    } = themeContext.builders[theme.builder];
+
+    const palette = paletteBuilder(colors);
+    const shapes = shapesBuilder(spacing, colors);
+    const transitions = transitionsBuilder(timing);
+    const typo = typoBuilder(spacing);
+
+    const styles = stylesBuilder({
+      colors: colors,
+      palette,
+      shapes,
+      spacing: spacing,
+      timing: timing,
+      transitions,
+      typo,
+      look: look,
+    });
+
+    return {
+      ...theme,
+      styles,
+      palette,
+      shapes,
+      transitions,
+      typo,
+    };
+  }
+
+  render() {
+    if (!this.props.theme) {
+      return null;
+    }
+    const themeContext = themeContextImporter(this.props.themeContext);
+    this._theme = this.build(themeContext);
+    if (!this._theme) {
+      return null;
+    }
+    const globalStyles = themeContext.getGlobalStyles(this._theme);
+    if (this.props.frameThemeContext && globalStyles['.root']) {
+      globalStyles[`.root-${this.props.labId.replace(/@/g, '-')}`] =
+        globalStyles['.root'];
+      delete globalStyles['.root'];
+    }
+    const fonts = themeContext.getFonts(this._theme);
+
+    return (
+      // The `key` prop forces all children to be recreated when the theme changes
+      // Changing the (legacy) context is not sufficient to redraw the children
+      <React.Fragment key={this._theme.cacheName}>
+        {/* // This <style> is not necessary without shadow dom and causes errors in aphrodite after unmount and remount */}
+        {/* <style type="text/css" data-aphrodite /> */}
+        {globalStyles && (
+          <style
+            type="text/css"
+            dangerouslySetInnerHTML={{__html: jsToCSS(globalStyles)}}
+          />
+        )}
+        {fonts && (
+          <style type="text/css" dangerouslySetInnerHTML={{__html: fonts}} />
+        )}
+        {this.props.children}
+      </React.Fragment>
+    );
+  }
+}
+
+export default Widget.connect((state, props) => {
+  const {labId, themeContext, currentTheme} = props;
+  const themesGen = state.get(`backend.${labId}.themesGen`);
+
+  if (!state.has(`backend.theme-composer@${themeContext}`)) {
+    console.warn(`theme context "${themeContext}" is missing`);
+  }
+
+  return {
+    theme: state.get(
+      `backend.theme-composer@${themeContext}.themes.${currentTheme}`
+    ),
+    themesGen,
+  };
+})(ThemeContext);

package/widgets/view/index.js

@@ -1,31 +1,31 @@
-//T:2019-02-27
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import Widget from 'goblin-laboratory/widgets/widget';
-
-class View extends Widget {
-  constructor() {
-    super(...arguments);
-  }
-
-  getChildContext() {
-    return {
-      desktopId: this.props.desktopId,
-      contextId: this.props.context,
-    };
-  }
-
-  static get childContextTypes() {
-    return {
-      desktopId: PropTypes.string,
-      contextId: PropTypes.string,
-    };
-  }
-
-  render() {
-    return <div>Missing view render implementation</div>;
-  }
-}
-
-export default View;
+//T:2019-02-27
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import Widget from 'goblin-laboratory/widgets/widget';
+
+class View extends Widget {
+  constructor() {
+    super(...arguments);
+  }
+
+  getChildContext() {
+    return {
+      desktopId: this.props.desktopId,
+      contextId: this.props.context,
+    };
+  }
+
+  static get childContextTypes() {
+    return {
+      desktopId: PropTypes.string,
+      contextId: PropTypes.string,
+    };
+  }
+
+  render() {
+    return <div>Missing view render implementation</div>;
+  }
+}
+
+export default View;