Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/internal/global-flags/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ interface GlobalFlags {
appLayoutWidget?: boolean;
appLayoutToolbar?: boolean;
analyticsMetadata?: boolean;
oneTheme?: boolean;
}

export interface FlagsHolder {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ describe('useVisualRefresh', () => {
afterEach(() => {
clearVisualRefreshState();
expect(document.querySelector('.awsui-visual-refresh')).toBeFalsy();
expect(document.querySelector('.awsui-one-theme')).toBeFalsy();
});
afterEach(() => {
clearMessageCache();
Expand All @@ -38,6 +39,12 @@ describe('useVisualRefresh', () => {
expect(screen.getByTestId('current-mode')).toHaveTextContent('true');
});

test('should return true when awsui-one-theme class name is present', () => {
document.body.classList.add('awsui-one-theme');
render(<App />);
expect(screen.getByTestId('current-mode')).toHaveTextContent('true');
});

test('should print a warning when late visual refresh class name was detected', () => {
jest.spyOn(console, 'warn').mockImplementation(() => {});
const { rerender } = render(<App />);
Expand Down Expand Up @@ -83,4 +90,18 @@ describe('useVisualRefresh', () => {
expect(screen.getByTestId('current-mode')).toHaveTextContent('true');
});
});

describe('oneTheme global flag', () => {
const awsuiGlobalFlagsSymbol = Symbol.for('awsui-global-flags');

afterEach(() => {
delete (window as any)[awsuiGlobalFlagsSymbol];
});

test('should return true when oneTheme global flag is set', () => {
(window as any)[awsuiGlobalFlagsSymbol] = { oneTheme: true };
render(<App />);
expect(screen.getByTestId('current-mode')).toHaveTextContent('true');
});
});
});
7 changes: 4 additions & 3 deletions src/internal/visual-mode/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { createSingletonHandler } from '../singleton-handler/index.js';
import { useStableCallback } from '../stable-callback/index.js';
import { isDevelopment } from '../is-development.js';
import { warnOnce } from '../logging.js';
import { awsuiVisualRefreshFlag, getGlobal } from '../global-flags/index.js';
import { awsuiVisualRefreshFlag, getGlobal, getGlobalFlag } from '../global-flags/index.js';
import { safeMatchMedia } from '../utils/safe-match-media.js';

export function isMotionDisabled(element: HTMLElement): boolean {
Expand Down Expand Up @@ -100,16 +100,17 @@ export function clearVisualRefreshState() {
visualRefreshState = undefined;
if (typeof document !== 'undefined') {
document.body.classList.remove('awsui-visual-refresh');
document.body.classList.remove('awsui-one-theme');
}
}

function detectVisualRefreshClassName() {
return typeof document !== 'undefined' && !!document.querySelector('.awsui-visual-refresh');
return typeof document !== 'undefined' && !!document.querySelector('.awsui-visual-refresh, .awsui-one-theme');
}

function detectVisualRefreshFlag() {
const global = getGlobal();
return global?.[awsuiVisualRefreshFlag]?.() ?? false;
return global?.[awsuiVisualRefreshFlag]?.() ?? !!getGlobalFlag('oneTheme');
}

export function useRuntimeVisualRefresh() {
Expand Down
Loading