diff --git a/packages/media/src/media.ts b/packages/media/src/media.ts index 9cd98e0..0cfc141 100644 --- a/packages/media/src/media.ts +++ b/packages/media/src/media.ts @@ -36,7 +36,7 @@ export function createQueryArray(queries: Partial = {}): string { boundaryTypes.hasOwnProperty(key) ? acc.concat(mediaBounds({ [key]: queries[key] })) : acc.concat(formatQueryValue(queries[key])), - [] + [] as string[] ) .join(' and '); } diff --git a/packages/media/src/mediaBoundaries.ts b/packages/media/src/mediaBoundaries.ts index b2d5024..d88c457 100644 --- a/packages/media/src/mediaBoundaries.ts +++ b/packages/media/src/mediaBoundaries.ts @@ -33,7 +33,7 @@ export function mediaBounds( ): string | string[] { if (!!query && Object.keys(query).length) { const [key, value] = Object.entries(query)[0]; - return createBoundaryString(key, value); + return createBoundaryString(key, value as string); } return ''; @@ -63,6 +63,13 @@ const VALUE_REGEX = /((\d{1,}\/\d{1,})|(\d{1,}(rem|em|px|vh|vw)))+/g; export const extractValues = extractByRegex.bind(null, VALUE_REGEX); export const extractOperators = extractByRegex.bind(null, OPERATOR_REGEX); -export function extractByRegex(REGEX: RegExp, value: string): string[] { - return isNonEmptyString(value) ? value.match(REGEX) : []; +export function extractByRegex( + REGEX: RegExp, + value: string +): RegExpMatchArray | string[] { + if (!isNonEmptyString(value)) { + return []; + } + + return value.match(REGEX) || []; }