Skip to content

Commit 5cc46f4

Browse files
talisraeliealush
authored andcommitted
Added searchPlaceholder prop to config, as an alternative to searchPlaceHolder.
1 parent 626b827 commit 5cc46f4

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.4.11",
2+
"version": "4.4.12",
33
"license": "MIT",
44
"main": "dist/index.js",
55
"typings": "dist/index.d.ts",

src/config/config.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import {
1717

1818
const KNOWN_FAILING_EMOJIS = ['2640-fe0f', '2642-fe0f', '2695-fe0f'];
1919

20+
export const DEFAULT_SEARCH_PLACEHOLDER = 'Search';
21+
2022
export function mergeConfig(
2123
userConfig: PickerConfig = {}
2224
): PickerConfigInternal {
@@ -66,7 +68,8 @@ export function basePickerConfig(): PickerConfigInternal {
6668
...basePreviewConfig
6769
},
6870
searchDisabled: false,
69-
searchPlaceHolder: 'Search',
71+
searchPlaceHolder: DEFAULT_SEARCH_PLACEHOLDER,
72+
searchPlaceholder: DEFAULT_SEARCH_PLACEHOLDER,
7073
skinTonePickerLocation: SkinTonePickerLocation.SEARCH,
7174
skinTonesDisabled: false,
7275
suggestedEmojisMode: SuggestionMode.FREQUENT,
@@ -79,6 +82,7 @@ export function basePickerConfig(): PickerConfigInternal {
7982
export type PickerConfigInternal = {
8083
emojiVersion: string | null;
8184
searchPlaceHolder: string;
85+
searchPlaceholder: string;
8286
defaultSkinTone: SkinTones;
8387
skinTonesDisabled: boolean;
8488
autoFocusSearch: boolean;

src/config/useConfig.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,19 @@ import {
1010
} from '../types/exposedTypes';
1111

1212
import { CategoriesConfig } from './categoryConfig';
13-
import { PickerDimensions, PreviewConfig } from './config';
13+
import {
14+
DEFAULT_SEARCH_PLACEHOLDER,
15+
PickerDimensions,
16+
PreviewConfig,
17+
} from './config';
1418

1519
export function useSearchPlaceHolderConfig(): string {
16-
const { searchPlaceHolder } = usePickerConfig();
17-
return searchPlaceHolder;
20+
const { searchPlaceHolder, searchPlaceholder } = usePickerConfig();
21+
return (
22+
[searchPlaceHolder, searchPlaceholder].find(
23+
(p) => p !== DEFAULT_SEARCH_PLACEHOLDER
24+
) ?? DEFAULT_SEARCH_PLACEHOLDER
25+
);
1826
}
1927

2028
export function useDefaultSkinToneConfig(): SkinTones {

stories/picker.stories.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const EmojiImageTwitter = (args: Props) => (
8787
<Template {...args} emojiStyle={EmojiStyle.TWITTER} />
8888
);
8989
export const CustomSearchPlaceholder = (args: Props) => (
90-
<Template searchPlaceHolder="👀 Find" />
90+
<Template searchPlaceholder="👀 Find" />
9191
);
9292
export const SkinTonesDisabled = (args: Props) => (
9393
<Template {...args} skinTonesDisabled />
@@ -172,16 +172,18 @@ export const StandaloneEmojiNative = () => {
172172
return <Emoji unified="1f60a" emojiStyle={EmojiStyle.NATIVE} size={35} />;
173173
};
174174
export const CustomUnifiedEmojiImage = () => {
175-
const [unified, setUnified] = useState("1f9d1-1f3ff-200d-1f4bc");
175+
const [unified, setUnified] = useState('1f9d1-1f3ff-200d-1f4bc');
176176

177-
return <>
178-
<Emoji unified={unified} size={35} />
179-
<input onChange={(e) => setUnified(e.target.value)} value={unified} />
180-
</>
181-
}
177+
return (
178+
<>
179+
<Emoji unified={unified} size={35} />
180+
<input onChange={e => setUnified(e.target.value)} value={unified} />
181+
</>
182+
);
183+
};
182184

183185
export const HideEmojisByUnicode = (args: Props) => (
184-
<Template {...args} emojiStyle={EmojiStyle.NATIVE} />
186+
<Template {...args} emojiStyle={EmojiStyle.NATIVE} />
185187
);
186188

187189
function TemplateDark(args) {

0 commit comments

Comments
 (0)