Skip to content

fix(core): reset works also for shorthands #670

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

Draft
layershifter wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(core): reset works also for shorthands #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions packages/core/src/mergeClasses.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,16 @@ describe('mergeClasses', () => {
expect(mergeClasses(classNameA, classNameC)).toMatchInlineSnapshot(`fe3e8s9`);
expect(mergeClasses(classNameA, classNameB, classNameC)).toMatchInlineSnapshot(`ftu9nv0`);
});

it('handles resets for shorthands', () => {
const computeClassesA = makeStyles({ root: { transitionDuration: '1s' } });
const computeClassesB = makeStyles({ root: { color: 'red', transition: RESET } });

const classNameA = computeClassesA(options).root;
const classNameB = computeClassesB(options).root;

expect(mergeClasses(classNameA, classNameB)).toMatchInlineSnapshot(`fe3e8s9`);
});
});
});

Expand Down
4 changes: 4 additions & 0 deletions packages/core/src/runtime/resolveStyleRules.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,10 @@ describe('resolveStyleRules', () => {
{ sj55zd: 'fe3e8s9', uwmqm3: 0 },
{ d: ['.fe3e8s9{color:red;}'] },
]);
expect(resolveStyleRules({ color: 'red', transition: RESET })).toEqual([
{ B3o57yi: 0, Bi2q7bf: 0, Bkqvd7p: 0, Bmy1vo4: 0, Bn62ygk: 0, Cwk7ip: 0, sj55zd: 'fe3e8s9' },
{ d: ['.fe3e8s9{color:red;}'] },
]);
});
});

Expand Down
23 changes: 13 additions & 10 deletions packages/core/src/runtime/resolveStyleRules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,17 @@ export function resolveStyleRules(
continue;
}

if (isResetValue(value)) {
if (typeof value === 'string' || typeof value === 'number') {
const isReset = isResetValue(value);

const selector = trimSelector(selectors.join(''));
const shorthand = getShorthandDefinition(property);
// uniq key based on a hash of property & selector, used for merging later
const key = hashPropertyKey(selector, property, atRules);

pushToClassesMap(cssClassesMap, key, 0, undefined);
continue;
}

if (typeof value === 'string' || typeof value === 'number') {
const selector = trimSelector(selectors.join(''));
const shorthand = getShorthandDefinition(property);
if (isReset) {
pushToClassesMap(cssClassesMap, key, 0, undefined);
}

if (shorthand) {
const shorthandProperties = shorthand[1];
Expand All @@ -133,8 +132,12 @@ export function resolveStyleRules(
resolveStyleRules(shorthandResetStyles, classNameHashSalt, selectors, atRules, cssClassesMap, cssRulesByBucket);
}

// uniq key based on a hash of property & selector, used for merging later
const key = hashPropertyKey(selector, property, atRules);
// Heads up!
// We don't need to generate CSS rules for reset values as they are not used in the output
if (isReset) {
continue;
}

const className = hashClassName(
{
value: value.toString(),
Expand Down
Loading