Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(types): fix cssClasses of voiceSearch #3783

Merged
merged 4 commits into from
May 20, 2019
Merged

fix(types): fix cssClasses of voiceSearch #3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0776914
type(voiceSearch): fix cssClasses
May 17, 2019
c4f3e5b
type(voiceSearch): handle the situation where type of cssClasses changes
May 17, 2019
7691171
type(voiceSearch): change type of cssClasses to fit in with the compo…
May 20, 2019
c8fb656
Merge branch 'develop' into type/fix-voice-search-css-classes
May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/components/VoiceSearch/VoiceSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 7 additions & 5 deletions src/widgets/voice-search/voice-search.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ 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';

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 = {
Expand All @@ -44,7 +46,7 @@ type VoiceSearchWidgetParams = {

interface VoiceSearchRendererWidgetParams extends VoiceSearchWidgetParams {
container: HTMLElement;
cssClasses: VoiceSearchCSSClasses;
cssClasses: VoiceSearchComponentCSSClasses;
templates: VoiceSearchTemplates;
}

Expand Down