diff --git a/packages/emoji-mart/package.json b/packages/emoji-mart/package.json index cd0c9932..281eecd3 100644 --- a/packages/emoji-mart/package.json +++ b/packages/emoji-mart/package.json @@ -1,6 +1,6 @@ { "name": "@campsite-software/emoji-mart", - "version": "5.6.0", + "version": "5.6.1-reactive-store.11", "description": "Emoji picker for the web", "license": "MIT", "homepage": "https://github.com/campsite/emoji-mart", diff --git a/packages/emoji-mart/src/components/Picker/Picker.tsx b/packages/emoji-mart/src/components/Picker/Picker.tsx index 24cad2e6..535a33a0 100644 --- a/packages/emoji-mart/src/components/Picker/Picker.tsx +++ b/packages/emoji-mart/src/components/Picker/Picker.tsx @@ -97,6 +97,7 @@ export default class Picker extends Component { const nextState = this.getInitialState() if (requiresGridReset) { + console.log('picker requires grid reset') return this.reset(nextState) } @@ -109,6 +110,7 @@ export default class Picker extends Component { } async reset(nextState = {}) { + console.log('picker reset init') await init(this.props) this.initGrid() diff --git a/packages/emoji-mart/src/components/Picker/PickerElement.tsx b/packages/emoji-mart/src/components/Picker/PickerElement.tsx index 78d16fd9..8039f181 100644 --- a/packages/emoji-mart/src/components/Picker/PickerElement.tsx +++ b/packages/emoji-mart/src/components/Picker/PickerElement.tsx @@ -20,6 +20,8 @@ export default class PickerElement extends ShadowElement { this.component = component } + console.log('picker connected callback', props) + await init(props) if (this.disconnected) return diff --git a/packages/emoji-mart/src/config.ts b/packages/emoji-mart/src/config.ts index 725e3a38..7c33de9c 100644 --- a/packages/emoji-mart/src/config.ts +++ b/packages/emoji-mart/src/config.ts @@ -47,8 +47,12 @@ export function init(options, { caller } = {}) { } async function _init(props) { + console.log('init', Data, props) initialized = true + // console.log('init reset data') + // Data = null + let { emojiVersion, set, locale } = props emojiVersion || (emojiVersion = PickerProps.emojiVersion.value) set || (set = PickerProps.set.value) @@ -80,8 +84,10 @@ async function _init(props) { Data.originalCategories = Data.categories } else { + console.log('init else', Data.originalCategories) Data.categories = Data.categories.filter((c) => { const isCustom = !!c.name + console.log('init categories filtering', { c, isCustom }) if (!isCustom) return true return false @@ -111,6 +117,7 @@ async function _init(props) { category.target = prevCategory.target || prevCategory } + console.log('init push category', { category }) Data.categories.push(category) for (const emoji of category.emojis) { @@ -120,6 +127,10 @@ async function _init(props) { } if (props.categories) { + console.log('init override categories', { + categories: Data.categories, + originalCategories: Data.originalCategories, + }) Data.categories = Data.originalCategories .filter((c) => { return props.categories.indexOf(c.id) != -1 @@ -248,9 +259,10 @@ async function _init(props) { } } - if (resetSearchIndex) { - SearchIndex.reset() - } + // if (resetSearchIndex) { + console.log('init reset search index') + SearchIndex.reset() + // } initCallback() } @@ -263,6 +275,8 @@ export function getProps(props, defaultProps, element) { _props[k] = getProp(k, props, defaultProps, element) } + console.log('new props', { _props }) + return _props } @@ -274,6 +288,8 @@ export function getProp(propName, props, defaultProps, element) { ? props[propName] : null) + console.log('getProp', { propName, props, defaultProps, value, defaults }) + if (!defaults) { return value } diff --git a/packages/emoji-mart/src/helpers/search-index.ts b/packages/emoji-mart/src/helpers/search-index.ts index 20ae01fb..a86fe84a 100644 --- a/packages/emoji-mart/src/helpers/search-index.ts +++ b/packages/emoji-mart/src/helpers/search-index.ts @@ -36,7 +36,8 @@ async function search(value, { maxResults, caller } = {}) { if (!values.length) return - let pool = Pool || (Pool = Object.values(Data.emojis)) + // let pool = Pool || (Pool = Object.values(Data.emojis)) + let pool = Object.values(Data.emojis) let results, scores for (const value of values) {