Skip to content

Commit

Permalink
Merge pull request #11 from heyjul3s/feat/media-update
Browse files Browse the repository at this point in the history
split mediaDevices to mediaInput and mediaDisplay
  • Loading branch information
heyjul3s committed Nov 10, 2020
2 parents fd94c0e + f7123dd commit 02dc065
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 74 deletions.
4 changes: 2 additions & 2 deletions packages/media/__tests__/mediaDevices.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { mediaDeviceQueries } from '../src/mediaDevices';
import { mediaInputQueries } from '../src/mediaInput';

describe('mediaDevices', () => {
it('should be defined', () => {
expect(mediaDeviceQueries).toBeDefined;
expect(mediaInputQueries).toBeDefined;
});
});
8 changes: 5 additions & 3 deletions packages/media/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { mediaDeviceQueries } from './mediaDevices';
import { mediaInputQueries } from './mediaInput';
import { mediaTypeQueries } from './mediaTypes';
import { mediaAccessibilityQueries } from './mediaAccessibilty';
import { mediaDisplayQueries } from './mediaDisplay';

export const {
all,
Expand Down Expand Up @@ -29,7 +30,8 @@ export const {
reducedMotion,
reducedMotionAny
} = {
...mediaDeviceQueries,
...mediaInputQueries,
...mediaTypeQueries,
...mediaAccessibilityQueries
...mediaAccessibilityQueries,
...mediaDisplayQueries
};
65 changes: 0 additions & 65 deletions packages/media/src/mediaDevices.ts

This file was deleted.

33 changes: 33 additions & 0 deletions packages/media/src/mediaDisplay.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
export enum MediaDeviceQueryKeys {
'landscape' = 'landscape',
'portrait' = 'portrait',
'fullScreen' = 'displayFullScreen',
'standalone' = 'displayStandalone',
'minUI' = 'displayMinUI',
'browser' = 'displayBrowser'
}

export type MediaDisplayQueries = {
[MediaDeviceQueryKeys.browser]: DisplayModeBrowser;
[MediaDeviceQueryKeys.fullScreen]: DisplayModeFullScreen;
[MediaDeviceQueryKeys.minUI]: DisplayModeMinUI;
[MediaDeviceQueryKeys.standalone]: DisplayModeStandalone;
[MediaDeviceQueryKeys.landscape]: OrientationLandscape;
[MediaDeviceQueryKeys.portrait]: OrientationPortrait;
};

export type DisplayModeBrowser = 'display-mode: browser';
export type DisplayModeFullScreen = 'display-mode: fullscreen';
export type DisplayModeMinUI = 'display-mode: minimal-ui';
export type DisplayModeStandalone = 'display-mode: standalone';
export type OrientationLandscape = 'orientation: landscape';
export type OrientationPortrait = 'orientation: portrait';

export const mediaDisplayQueries: MediaDisplayQueries = {
[MediaDeviceQueryKeys.landscape]: 'orientation: landscape',
[MediaDeviceQueryKeys.portrait]: 'orientation: portrait',
[MediaDeviceQueryKeys.fullScreen]: 'display-mode: fullscreen',
[MediaDeviceQueryKeys.standalone]: 'display-mode: standalone',
[MediaDeviceQueryKeys.minUI]: 'display-mode: minimal-ui',
[MediaDeviceQueryKeys.browser]: 'display-mode: browser'
};
47 changes: 47 additions & 0 deletions packages/media/src/mediaInput.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
export enum MediaInputQueryKeys {
'anyHover' = 'anyHover',
'anyHoverNone' = 'anyHoverNone',
'hover' = 'hover',
'hoverNone' = 'hoverNone',
'anyPointer' = 'anyPointer',
'anyPointerNone' = 'anyPointerNone',
'pointer' = 'pointer',
'pointerNone' = 'pointerNone'
}

export type MediaInputQueries = {
[MediaInputQueryKeys.anyHover]: AnyHover;
[MediaInputQueryKeys.anyHoverNone]: AnyHoverNone;
[MediaInputQueryKeys.anyPointer]: AnyPointer;
[MediaInputQueryKeys.anyPointerNone]: AnyPointerNone;
[MediaInputQueryKeys.hover]: Hover;
[MediaInputQueryKeys.hoverNone]: HoverNone;
[MediaInputQueryKeys.pointer]: Pointer;
[MediaInputQueryKeys.pointerNone]: PointerNone;
};

export type AnyHover = 'any-hover: hover';
export type AnyHoverNone = 'any-hover: none';
export type AnyPointer = 'any-pointer: pointer';
export type AnyPointerNone = 'any-pointer: none';
export type DisplayModeBrowser = 'display-mode: browser';
export type DisplayModeFullScreen = 'display-mode: fullscreen';
export type DisplayModeMinUI = 'display-mode: minimal-ui';
export type DisplayModeStandalone = 'display-mode: standalone';
export type Hover = 'hover: hover';
export type HoverNone = 'hover: none';
export type OrientationLandscape = 'orientation: landscape';
export type OrientationPortrait = 'orientation: portrait';
export type Pointer = 'pointer: pointer';
export type PointerNone = 'pointer: none';

export const mediaInputQueries: MediaInputQueries = {
[MediaInputQueryKeys.anyHover]: 'any-hover: hover',
[MediaInputQueryKeys.anyHoverNone]: 'any-hover: none',
[MediaInputQueryKeys.hover]: 'hover: hover',
[MediaInputQueryKeys.hoverNone]: 'hover: none',
[MediaInputQueryKeys.anyPointer]: 'any-pointer: pointer',
[MediaInputQueryKeys.anyPointerNone]: 'any-pointer: none',
[MediaInputQueryKeys.pointer]: 'pointer: pointer',
[MediaInputQueryKeys.pointerNone]: 'pointer: none'
};
10 changes: 6 additions & 4 deletions packages/media/src/typings.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { MediaBoundaries } from './mediaBoundaries';
import { MediaDeviceQueries } from './mediaDevices';
import { MediaTypes } from './MediaTypes';
import { MediaInputQueries } from './mediaInput';
import { MediaTypes } from './mediaTypes';
import { MediaAccessibilityQueries } from './mediaAccessibilty';
import { MediaDisplayQueries } from './mediaDisplay';

export type Media = MediaBoundaries &
MediaDeviceQueries &
MediaInputQueries &
MediaTypes &
MediaAccessibilityQueries;
MediaAccessibilityQueries &
MediaDisplayQueries;

0 comments on commit 02dc065

Please sign in to comment.