From 0776914fbf6dfbe134a99713a0fa5e6ef58e447d Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 17 May 2019 16:37:20 +0200 Subject: [PATCH 1/3] type(voiceSearch): fix cssClasses --- src/widgets/voice-search/voice-search.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/voice-search/voice-search.tsx b/src/widgets/voice-search/voice-search.tsx index 1718734ec4..9d73a7e679 100644 --- a/src/widgets/voice-search/voice-search.tsx +++ b/src/widgets/voice-search/voice-search.tsx @@ -16,9 +16,9 @@ const withUsage = createDocumentationMessageGenerator({ name: 'voice-search' }); const suit = component('VoiceSearch'); export type VoiceSearchCSSClasses = { - root: string; - button: string; - status: string; + root: string | string[]; + button: string | string[]; + status: string | string[]; }; type VoiceSearchTemplateProps = { From c4f3e5ba83aef2cf63de53a1034ae8ad13fdab11 Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Fri, 17 May 2019 17:09:05 +0200 Subject: [PATCH 2/3] type(voiceSearch): handle the situation where type of cssClasses changes --- src/components/VoiceSearch/VoiceSearch.tsx | 13 ++++++++----- src/widgets/voice-search/voice-search.tsx | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/VoiceSearch/VoiceSearch.tsx b/src/components/VoiceSearch/VoiceSearch.tsx index bea3bb818a..668bfb6df5 100644 --- a/src/components/VoiceSearch/VoiceSearch.tsx +++ b/src/components/VoiceSearch/VoiceSearch.tsx @@ -1,18 +1,21 @@ import React from 'preact-compat'; import Template from '../Template/Template'; -import { - VoiceSearchCSSClasses, - VoiceSearchTemplates, -} from '../../widgets/voice-search/voice-search'; +import { VoiceSearchTemplates } from '../../widgets/voice-search/voice-search'; import { VoiceListeningState, ToggleListening, } from '../../lib/voiceSearchHelper'; +export type VoiceSearchComponentCSSClasses = { + root: string; + button: string; + status: string; +}; + export type VoiceSearchProps = { - cssClasses: VoiceSearchCSSClasses; + cssClasses: VoiceSearchComponentCSSClasses; isBrowserSupported: boolean; isListening: boolean; toggleListening: ToggleListening; diff --git a/src/widgets/voice-search/voice-search.tsx b/src/widgets/voice-search/voice-search.tsx index 9d73a7e679..ea0c7d6310 100644 --- a/src/widgets/voice-search/voice-search.tsx +++ b/src/widgets/voice-search/voice-search.tsx @@ -8,7 +8,9 @@ import { component } from '../../lib/suit'; import connectVoiceSearch, { VoiceSearchRenderer, } from '../../connectors/voice-search/connectVoiceSearch'; -import VoiceSearch from '../../components/VoiceSearch/VoiceSearch'; +import VoiceSearch, { + VoiceSearchComponentCSSClasses, +} from '../../components/VoiceSearch/VoiceSearch'; import defaultTemplates from './defaultTemplates'; import { WidgetFactory, Template } from '../../types'; @@ -61,7 +63,7 @@ const renderer: VoiceSearchRenderer = ({ render( Date: Mon, 20 May 2019 14:39:27 +0200 Subject: [PATCH 3/3] type(voiceSearch): change type of cssClasses to fit in with the component --- src/widgets/voice-search/voice-search.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/voice-search/voice-search.tsx b/src/widgets/voice-search/voice-search.tsx index ea0c7d6310..ce16c347bc 100644 --- a/src/widgets/voice-search/voice-search.tsx +++ b/src/widgets/voice-search/voice-search.tsx @@ -46,7 +46,7 @@ type VoiceSearchWidgetParams = { interface VoiceSearchRendererWidgetParams extends VoiceSearchWidgetParams { container: HTMLElement; - cssClasses: VoiceSearchCSSClasses; + cssClasses: VoiceSearchComponentCSSClasses; templates: VoiceSearchTemplates; } @@ -63,7 +63,7 @@ const renderer: VoiceSearchRenderer = ({ render(