change structure to allow passing in meta data - fixes draft-js-plugins#33

nikgraf · nikgraf · commit bf57a8a43356 · 2016-03-03T16:24:09.000-08:00
diff --git a/site/components/UnicornEditor/stickers.js b/site/components/UnicornEditor/stickers.js
@@ -1,29 +1,31 @@
 import { fromJS } from 'immutable';
 
 const stickers = fromJS({
-  'b3aa388f-b9f4-45b0-bba5-d92cf2caa48b': {
-    id: 'b3aa388f-b9f4-45b0-bba5-d92cf2caa48b',
-    url: 'images/unicorn-4.png',
-  },
-  'adec3f13-823c-47c3-b4d1-be4f68dd9d6d': {
-    id: 'adec3f13-823c-47c3-b4d1-be4f68dd9d6d',
-    url: 'images/unicorn-1.png',
-  },
-  'e14b5a20-1025-4952-b731-41cd4b118ba0': {
-    id: 'e14b5a20-1025-4952-b731-41cd4b118ba0',
-    url: 'images/unicorn-6.png',
-  },
-  '659a0dbf-5f85-4f32-999d-eb9ba6b0f417': {
-    id: '659a0dbf-5f85-4f32-999d-eb9ba6b0f417',
-    url: 'images/unicorn-2.png',
-  },
-  'fab0ae95-ae95-4775-b484-72c290437602': {
-    id: 'fab0ae95-ae95-4775-b484-72c290437602',
-    url: 'images/unicorn-5.png',
-  },
-  '71853190-8acd-4d3b-b4fd-63f7b0648daa': {
-    id: '71853190-8acd-4d3b-b4fd-63f7b0648daa',
-    url: 'images/unicorn-3.png',
+  data: {
+    'b3aa388f-b9f4-45b0-bba5-d92cf2caa48b': {
+      id: 'b3aa388f-b9f4-45b0-bba5-d92cf2caa48b',
+      url: 'images/unicorn-4.png',
+    },
+    'adec3f13-823c-47c3-b4d1-be4f68dd9d6d': {
+      id: 'adec3f13-823c-47c3-b4d1-be4f68dd9d6d',
+      url: 'images/unicorn-1.png',
+    },
+    'e14b5a20-1025-4952-b731-41cd4b118ba0': {
+      id: 'e14b5a20-1025-4952-b731-41cd4b118ba0',
+      url: 'images/unicorn-6.png',
+    },
+    '659a0dbf-5f85-4f32-999d-eb9ba6b0f417': {
+      id: '659a0dbf-5f85-4f32-999d-eb9ba6b0f417',
+      url: 'images/unicorn-2.png',
+    },
+    'fab0ae95-ae95-4775-b484-72c290437602': {
+      id: 'fab0ae95-ae95-4775-b484-72c290437602',
+      url: 'images/unicorn-5.png',
+    },
+    '71853190-8acd-4d3b-b4fd-63f7b0648daa': {
+      id: '71853190-8acd-4d3b-b4fd-63f7b0648daa',
+      url: 'images/unicorn-3.png',
+    },
   },
 });
 
diff --git a/src/stickerPlugin/Sticker/index.js b/src/stickerPlugin/Sticker/index.js
@@ -22,7 +22,7 @@ export default (stickers) => {
       const data = Entity.get(block.getEntityAt(0)).getData();
       return (
         <figure style={ styles.root } contentEditable={ false } data-offset-key={ `${block.get('key')}-0-0` }>
-          <img style={ styles.image } src={ stickers.getIn([data.id, 'url']) } />
+          <img style={ styles.image } src={ stickers.getIn(['data', data.id, 'url']) } />
           <span
             style={ styles.removeButton }
             onClick={ this.remove }
diff --git a/src/stickerPlugin/StickerSelect/index.js b/src/stickerPlugin/StickerSelect/index.js
@@ -71,7 +71,7 @@ export default (stickers) => {
 
     render() {
       // Create the sticker selection elements
-      const stickerElements = stickers.map((sticker) => {
+      const stickerElements = stickers.get('data').map((sticker) => {
         const id = sticker.get('id');
         const url = sticker.get('url');
         return (
