Commit Graph

240 Commits (f879348e2e54490517b0e19c20e8a2e006833c91)

Author SHA1 Message Date
Etienne Lemay 922ae30a0f Fix TypeError on emoji click when picker has been unmounted [Fix #126]
`isMounted` is being deprecated, so we test against scroll ref being defined
2017-09-29 19:14:24 -04:00
Etienne Lemay 81f39b138a Use SVGs inline 2017-09-29 14:33:08 -04:00
Eugen Rochko fdb88daa31 Remove function binds in render wherever possible, use PureComponent 2017-09-29 16:46:29 +02:00
Etienne Lemay 620576d5a2 Use measure-scrollbar locally instead of a dependency
So that Babel doesn’t become a dependency just for that (lib is using export).
Giving credit to original author.
2017-09-28 20:04:24 -04:00
Etienne Lemay e8dc29bfaa Move data in src
So that it’s then compiled into dist
2017-09-28 20:03:23 -04:00
Etienne Lemay c607fd8864 Add showPreview props to Picker [Fix #42] 2017-09-27 22:07:34 -04:00
Etienne Lemay 9f49499240 Merge branch 'master' into feature-react-16 2017-09-27 20:00:37 -04:00
Eugen Rochko a381b554b6 Upgrade Webpack to 3.6 2017-09-27 21:47:41 +02:00
Eugen Rochko d13e3b5e03 Upgrade to React 16, do not use deprecated ref syntax 2017-09-27 21:27:52 +02:00
Etienne Lemay b5552be2c4 Fix activeCategory when scroll is above minTop 2017-09-25 21:15:07 -04:00
Etienne Lemay 2f77b6ac40 💄 2017-09-25 20:11:52 -04:00
Igor Lobanov 4dc05ef8da Size reduced from 87.35 KB to 79.43 KB 2017-09-17 12:06:42 +03:00
Igor Lobanov ce77166134 Webpack update 1.12.14 -> 3.6.0 2017-09-17 10:33:59 +03:00
Andrey Sitnik a3ec9493d7 Reduce size by removeing unnecessary util module 2017-09-11 14:38:37 +10:00
Etienne Lemay 6d60239998 Don’t use BundleAnalyzerPlugin in tests 2017-08-17 10:31:32 -04:00
Andrey Sitnik 4f9320a51f Add package size profiling tools 2017-08-16 15:33:24 -07:00
Etienne Lemay 4d57436bbe Fix search with include/exclude [Fix #89] 2017-06-27 17:05:05 -04:00
Etienne Lemay b90ca821bc Merge pull request #92 from MeisterLabs/ie-support
Improve support for Internet Explorer
2017-06-23 09:38:21 -04:00
Jakob Krigovsky 385408b51c Include scrollbar width in total picker width 2017-06-23 12:26:30 +02:00
Jakob Krigovsky 164e9d06ed Avoid Array.prototype.find() 2017-06-23 11:47:21 +02:00
Jakob Krigovsky 435250f319 Avoid Array.prototype.fill() 2017-06-23 11:47:21 +02:00
Sam Kelleher 30fa05f3c5
Switch default for simpler code. 2017-05-29 12:36:49 +01:00
Sam Kelleher 32a5206453
Flip wrong way round flag. 2017-05-29 12:30:04 +01:00
Sam Kelleher 184f2824f5
Do not store recent if recent category is hidden. 2017-05-29 12:29:11 +01:00
Etienne Lemay 1d57c216f5 Use svg-jsx for anchors
Fixes a React warning when using svg-inline-react
2017-05-27 14:52:38 -04:00
Etienne Lemay 3332c525d4 Add messenger & facebook sets 2017-05-27 14:15:56 -04:00
Etienne Lemay 33bcbda3d7 Do not render emoji when not supported in set 2017-05-27 13:52:12 -04:00
Etienne Lemay 7d014966e6 Unselect categories when searching 2017-05-27 13:40:54 -04:00
Etienne Lemay 98f2a95913 Use emoji object in `emojisToShowFilter`
So that custom emojis can also be filtered if need be
2017-05-27 13:26:02 -04:00
Etienne Lemay e95f515268 Add “Frequently Used” support to custom emojis 2017-05-27 13:17:21 -04:00
Etienne Lemay e28dc4da55 Make sure last category is selected when scrolled to bottom 2017-05-27 12:58:46 -04:00
Etienne Lemay d8b4c81534 Add include/exclude support to custom emojis 2017-05-27 12:27:47 -04:00
Etienne Lemay 1b77cb8244 Merge branch 'master' into custom-emojis 2017-05-27 11:26:59 -04:00
Etienne Lemay f4bbee1ecd Do not set skin when selecting the same 2017-05-27 11:16:54 -04:00
Etienne Lemay 81ccfbca03 Reset search index when changing include/exclude 2017-05-27 11:16:54 -04:00
Etienne Lemay b00572dfaf Fix search results for “-” not returning “-1” since 996c46cd 2017-05-27 11:16:54 -04:00
Etienne Lemay b149e37aad Update frequently defaults quantity when still unchanged 2017-05-27 11:16:54 -04:00
Etienne Lemay 2c35d5a8a8 Handle empty include/exclude arrays 2017-05-27 11:16:54 -04:00
Etienne Lemay 357653bb37 Do not include search input in the scroll container [Close #58] 2017-05-27 11:16:54 -04:00
Etienne Lemay 0736c65580 Use Emoji function instead of using JSX
So React doesn’t have to mount/unmount functional components
2017-05-27 11:16:54 -04:00
Etienne Lemay d2e37cad6d Functional Emoji component 2017-05-27 11:15:51 -04:00
Etienne Lemay 92985ecf29 Merge branch 'master' into emoji4 2017-05-27 11:03:41 -04:00
Etienne Lemay a4d0b6b410 Use emoji-datasource subpackages for sheets 2017-05-27 10:54:55 -04:00
Etienne Lemay b2d9311c87 Fix getting `skin_variations` data 2017-05-27 10:54:34 -04:00
Etienne Lemay 4a42680380 Merge branch 'master' into updateReact 2017-05-27 10:37:54 -04:00
Jakob Krigovsky 346e398d6e Guard sanitize() against undefined `short_names`
This is important when hovering over a custom emoji while searching.
2017-05-26 12:34:07 +02:00
Jakob Krigovsky 153998ca2c Add icon for custom category 2017-05-26 12:34:07 +02:00
Jakob Krigovsky 2fdd9fee34 Pass custom emojis to EmojiPicker#search 2017-05-26 12:34:07 +02:00
Jakob Krigovsky e10a779150 Add support for custom emojis to EmojiIndex#search 2017-05-26 12:34:07 +02:00
Jakob Krigovsky 289fc0ffc0 Pass custom emoji data directly to <Preview />
<Preview /> calls getData() itself which will fail for custom emojis because there is no universally available data source for custom emojis. To work around this, we pass the custom emoji data (which <Picker /> received via the `custom` prop) directly to <Preview />.
2017-05-26 12:12:59 +02:00
Jakob Krigovsky d237edc268 Add support for custom emojis to <Picker /> 2017-05-26 12:12:13 +02:00
Jakob Krigovsky d181379480 Add support for custom emojis to <Emoji /> 2017-05-26 12:06:28 +02:00
Jakob Krigovsky a28f04326a Add support for custom emojis to sanitize() 2017-05-26 12:06:28 +02:00
Jakob Krigovsky 2f7d6eb0d8 Guard buildSearch() against undefined properties
This is important if custom emojis don’t specify any emoticons, for example.
2017-05-26 09:43:11 +02:00
Sam Kelleher 95be21383d
Allow the fallback emoji to be optional, will display nothing. 2017-05-25 18:27:30 +01:00
Jakob Krigovsky 15c7b27ba9 Add support for custom emojis to getData() 2017-05-24 18:37:16 +02:00
Jakob Krigovsky d9c0139d73 Split out generation of search property 2017-05-24 18:34:10 +02:00
Christian Savard 52359b2688 Update react and remove react-addons-test-utils 2017-05-17 16:56:24 -04:00
Christian Savard 3373997cd6 Revert default sheetSize to 64px 2017-05-17 16:33:43 -04:00
Christian Savard 946737cc97 Merge branch 'master' into emoji4 2017-05-17 14:57:39 -04:00
Christian Savard 496ce3ee85 Update to latest emoji-datasource 2017-05-09 11:06:18 -04:00
nsarafa ed5a6f1777 update components from React.PropTypes to PropTypes package to avoid
warning message
2017-05-04 21:38:03 -04:00
Etienne Lemay 46cf7542c3 Update default frequently used 2017-04-24 04:28:39 +02:00
Justin 956fb94656 Add default frequently used defaults (closes #63) 2017-04-19 14:30:56 +01:00
Etienne Lemay f07c0c0638 Update “No Emoji Found” layout 2017-04-18 11:20:17 -04:00
Etienne Lemay b1d5c70bd2 Remove “No emoji found” hover [Close #59] 2017-04-18 11:07:43 -04:00
Etienne Lemay ebd3c6f6f0 Handle include/exclude in search results 2017-04-18 11:00:20 -04:00
Etienne Lemay 6a3b05d85e Slice search results only when necessary 2017-04-18 10:29:02 -04:00
Etienne Lemay 4a9497df0e Don’t call useless `emojisToShowFilter` when undefined 2017-04-18 10:22:32 -04:00
Etienne Lemay 046d489d7f Add “No emoji found” to i18n [Close #52] 2017-04-18 09:50:38 -04:00
Etienne Lemay c1bd9ea52c Support including/excluding the recent category 2017-04-08 09:08:42 -04:00
Etienne Lemay 81badd784f Sort categories by `include` props when defined 2017-04-07 16:54:07 -04:00
Etienne Lemay 4926b7bd43 💄 2017-04-04 12:00:32 -04:00
Etienne Lemay bb538ff9a3 Use lowercase category names in include/exclude [Ref #53] 2017-04-04 11:56:08 -04:00
Etienne Lemay 23cd1ea550 Fix specs since 83b1c02 2017-04-04 11:54:14 -04:00
Vincent Taverna a4419720e8 add prop to autofocus search input 2017-04-04 11:07:48 -04:00
Mads Hargreave 5602d3a3e4 Added `include` and `exclude` props to filter emoji categories 2017-04-01 16:02:55 +07:00
Etienne Lemay 83b1c02897 Include unified in sanitized data [Close #51] 2017-03-17 09:02:53 -04:00
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