Skip to content

Commit 9f3d4b1

Browse files
committed
feat(mapfromwindowstheme): move useGradients to object and add useShadows option
BREAKING CHANGE: useGradients is now inside an object
1 parent 90b6a0a commit 9f3d4b1

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

src/common/utils/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ function linearGradient(left, right) {
1414
return `linear-gradient(to right, ${left}, ${right})`;
1515
}
1616

17-
export function mapFromWindowsTheme(name, windowsTheme, useGradients) {
17+
export function mapFromWindowsTheme(
18+
name,
19+
windowsTheme,
20+
{ useGradients, useShadows } = {}
21+
) {
1822
/* eslint-disable no-unused-vars */
1923
const {
2024
ButtonAlternateFace,
@@ -87,6 +91,7 @@ export function mapFromWindowsTheme(name, windowsTheme, useGradients) {
8791
materialTextDisabledShadow: ButtonHilight,
8892
materialTextInvert: HilightText,
8993
progress: Hilight,
94+
shadow: useShadows,
9095
tooltip: InfoWindow
9196
};
9297
}

src/common/utils/index.spec.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,16 @@ describe('mapFromWindowsTheme', () => {
9393
materialTextDisabledShadow: '#000003',
9494
materialTextInvert: '#00001b',
9595
progress: '#00001a',
96+
shadow: false,
9697
tooltip: '#00001e'
9798
};
9899

99-
expect(mapFromWindowsTheme('theme', theme, false)).toEqual(expectedTheme);
100+
expect(
101+
mapFromWindowsTheme('theme', theme, {
102+
useGradients: false,
103+
useShadows: false
104+
})
105+
).toEqual(expectedTheme);
100106
});
101107

102108
it('should map corresponding properties with gradients if gradients are enabled', () => {
@@ -164,10 +170,16 @@ describe('mapFromWindowsTheme', () => {
164170
materialTextDisabledShadow: '#000003',
165171
materialTextInvert: '#00001b',
166172
progress: '#00001a',
173+
shadow: true,
167174
tooltip: '#00001e'
168175
};
169176

170-
expect(mapFromWindowsTheme('theme', theme, true)).toEqual(expectedTheme);
177+
expect(
178+
mapFromWindowsTheme('theme', theme, {
179+
useGradients: true,
180+
useShadows: true
181+
})
182+
).toEqual(expectedTheme);
171183
});
172184
});
173185

0 commit comments

Comments
 (0)