Commit Graph

112 Commits (2de83100a02b8374686ee6a318d882e0e96e820a)

Author SHA1 Message Date
Etienne Lemay 2de83100a0 Delete empty arrays from data file 2017-03-10 12:11:05 -05:00
Etienne Lemay f5ae64d07c Use variations at runtime instead of overriding data
Fixes a bug for emojis having both variations and skin variations
2017-02-17 12:50:20 -05:00
Etienne Lemay 1f88be1e8b Handle native change in shouldComponentUpdate 2017-02-17 10:48:57 -05:00
Etienne Lemay fc14f939c1 Fix native emojis size 2017-02-17 10:36:50 -05:00
Etienne Lemay d8f094e455 Rename “displayNative” => “native” for consistency w/ Emoji props 2017-02-17 10:13:59 -05:00
Thomas Osugi 6c2d1e4bf1 Honor perLine with for real
Signed-off-by: Chad Wagner <cwagner@pivotal.io>
2017-02-17 10:10:55 -05:00
Thomas Osugi 8e6c393ab7 [#138343455] Allow picker to display emoji natively rather than from spritesheet
Signed-off-by: Eric Dattore <edattore@pivotal.io>
2017-02-17 10:09:25 -05:00
Etienne Lemay 5c27f17154 Uncomment PR #43 specs 2017-02-17 09:47:14 -05:00
Etienne Lemay 82da9f2c7c Merge pull request #44 from pivotaltracker/add-testing-framework
Add karma/jasmine + tests for emoji-index and picker
2017-02-17 06:41:55 -08:00
Etienne Lemay a957fe196e Merge pull request #45 from smeijer/patch-1
allow style overrides from user
2017-02-17 06:40:40 -08:00
Etienne Lemay 3a554449f5 Merge pull request #46 from pivotaltracker/fix-ie-categories
Fix categories on IE11
2017-02-17 06:40:31 -08:00
Eric Dattore d3c1ab0828 [#139977619] fix regression in search with emoji mart picker 2017-02-16 10:09:10 -07:00
Eric Dattore 07b7bc2c50 [#138880131] fix issue with ie11 picker categories after searching
Signed-off-by: Devin Brown <debrown@pivotal.io>
2017-02-15 15:37:27 -07:00
Stephan Meijer ca27f3af06 allow style overrides from user
Change order of object merge, so the width can be overridden to for example '100%'
2017-02-04 12:00:22 +01:00
Thomas Osugi b9cb654761 Add karma/jasmine + tests for emoji-index and picker 2017-02-02 11:52:07 -07:00
Devin Brown 1a6e0e0fd3 add emojisToShow filter
Signed-off-by: Thomas Osugi <tosugi@pivotal.io>
2017-02-02 10:44:36 -07:00
Etienne Lemay 626d5b1ab4 Merge pull request #41 from pivotaltracker/preserve-svg-height-width
Preserve height and width on svgs
2017-01-27 06:16:08 -08:00
Thomas Osugi 9aab00c702 Preserve height and width on svgs
Signed-off-by: Eric Dattore <edattore@pivotal.io>
2017-01-26 17:18:14 -07:00
Frugality e8b6e27d33 Category: export from index.js 2017-01-24 16:58:18 -08:00
Scott Dodge 4c6f8c54c1 Add emoji prop change check to Emoji component 2017-01-17 23:58:43 -06:00
Etienne Lemay 7e2adc60a2 Merge pull request #29 from savardc/master
Fix issue with operator in skin tone logic
2017-01-16 16:42:47 -05:00
Trevor Rundell c3aae4fb04 wrap localStorage access in try-catch
Many browsers may support localStorage, but disable access to it in certain situations. For example, Safari private browsing mode will raise an exception if you try to access localStorage from a third-party domain, resulting in unhandled errors like...

> QuotaExceededError: DOM Exception 22: An attempt was made to add something to storage that exceeded the quota.

The easiest way to handle this for optional features is to simply try-catch all access to localStorage.
2017-01-15 10:52:54 -05:00
Christian Savard 0db181e301 Fix issue with operator in skin tone logic 2016-12-12 21:33:06 -05:00
Etienne Lemay 672a6a4dfc 💄 2016-12-07 20:57:42 -05:00
Etienne Lemay 0295f673b1 Merge pull request #27 from anri-asaturov/master
Allow custom namespace for store
2016-12-07 20:56:43 -05:00
Christian Savard 771b1e48f3 Use children passed through props 2016-12-07 15:04:39 -05:00
Anri Asaturov b3752574b2 Allow custom namespace for store 2016-12-07 01:23:35 +02:00
Etienne Lemay 462ba0cd26 Use dynamic version of emoji-datasource for the default sheet URL 2016-11-30 20:59:56 -05:00
Etienne Lemay 0d39e10a71 Don’t check for backgroundImageFn change in Category#shouldComponentUpdate
If the Fn is an anonymous function, it would always re-render the categories even when no other props change.
2016-11-30 20:31:02 -05:00
Marco Munizaga a4be90aa6e Add backgroundImageFn to allow local image sheets 2016-11-30 15:16:47 -08:00
Etienne Lemay dad72bc0fb Add `native` prop to Emoji 2016-11-01 11:54:25 -04:00
Etienne Lemay f3c1e94213 Export `unifiedToNative` utils 2016-11-01 11:51:55 -04:00
Etienne Lemay c4604741d9 Support :colons: syntax
i.e. 👍, 👍:skin-tone-3:
2016-11-01 11:51:19 -04:00
Etienne Lemay 1dfa58239f 💄 2016-10-26 23:27:55 -04:00
Etienne Lemay 4bc68419b2 Add i18n prop to Picker [Close #20] 2016-10-26 23:23:49 -04:00
Etienne Lemay 86ac1d4ac8 Add sheetSize prop to Picker & Emoji [Close #18] 2016-10-26 21:47:21 -04:00
Etienne Lemay afe882560e Set Emoji.propTypes.skin as an enum 2016-10-26 21:11:29 -04:00
Etienne Lemay ecc086260a Set Emoji.propTypes.set as an enum 2016-10-26 20:59:21 -04:00
Etienne Lemay 4f2b204c0e Remove “sheetURL” props & add “set” props
- Use sheets from emoji-data repo (from a CDN)
- Easier to setup/use
- Remove sheets from the repo
2016-10-18 21:21:56 -04:00
Etienne Lemay 35a992118a Use hasOwnProperty to detect if emoji exists
Fixes a bug in Firefox where “watch” emoji would throw because apparently `_emojiData = data.emojis['watch']` returns a function instead of the value of the watch key
2016-10-18 19:00:51 -04:00
Etienne Lemay 996c46cd9c Also split search terms at “-” & “_”
Like we do when building the search string in `build-data.js`
2016-10-14 15:56:17 -04:00
Etienne Lemay 44f9914b25 Handle “-1” search 2016-10-14 15:43:18 -04:00
Etienne Lemay dc93357137 Fix “Recent” category showing up when clicking an emoji for the first time while searching 2016-10-13 21:38:24 -04:00
Etienne Lemay 2aece93395 Support all short_names when getting emoji data [Fix #15] 2016-10-13 16:19:46 -04:00
Etienne Lemay 8f64b3c7d1 Handle unknown emojis [Fix #14] 2016-10-12 20:26:10 -04:00
Etienne Lemay 903395e31f 💄 2016-10-03 21:16:35 -04:00
Etienne Lemay f31a359f78 Add support for server-side rendering [Fix #7] 2016-10-03 21:16:20 -04:00
Etienne Lemay 7028383509 Update webpack React externals [Fix #11, Fix #8] 2016-09-29 21:02:05 -04:00
Etienne Lemay 9648c7d8e2 🏬 Emoji Mart™ 2016-07-27 11:35:12 -04:00
Etienne Lemay f7fd6e7d05 Sort search results by score [Close #1] 2016-07-26 15:31:27 -04:00