Repository navigation
feat: dynamic build time style matching function #716
+477
−205
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import { serialize } from './serialize' | ||
| import type { MediaQueryResolver } from './types' | ||
|
|
||
| const serializeDimension = (dimension: number | string) => typeof dimension === 'number' ? String(dimension) : serialize(dimension) | ||
|
|
||
| export const generateStyleMatcher = (style: MediaQueryResolver) => { | ||
| const conditions: Array<string> = [] | ||
|
|
||
| if (style.minWidthOperator !== null) { | ||
| conditions.push(`rt.screen.width ${style.minWidthOperator} (${serializeDimension(style.minWidth)})`) | ||
| } | ||
|
|
||
| if (style.maxWidthOperator !== null) { | ||
| conditions.push(`rt.screen.width ${style.maxWidthOperator} (${serializeDimension(style.maxWidth)})`) | ||
| } | ||
|
|
||
| if (style.minHeightOperator !== null) { | ||
| conditions.push(`rt.screen.height ${style.minHeightOperator} (${serializeDimension(style.minHeight)})`) | ||
| } | ||
|
|
||
| if (style.maxHeightOperator !== null) { | ||
| conditions.push(`rt.screen.height ${style.maxHeightOperator} (${serializeDimension(style.maxHeight)})`) | ||
| } | ||
|
|
||
| if (style.theme !== null) { | ||
| conditions.push(`(context.scopedTheme ?? rt.currentThemeName) === ${JSON.stringify(style.theme)}`) | ||
| } | ||
|
|
||
| if (style.orientation !== null) { | ||
| conditions.push(`rt.orientation === ${JSON.stringify(style.orientation)}`) | ||
| } | ||
|
|
||
| if (style.rtl !== null) { | ||
| conditions.push(`(context.rtl ?? rt.rtl) === ${style.rtl}`) | ||
| } | ||
|
|
||
| if (style.active !== null) { | ||
| conditions.push(`state?.isPressed === ${style.active}`) | ||
| } | ||
|
|
||
| if (style.focus !== null) { | ||
| conditions.push(`state?.isFocused === ${style.focus}`) | ||
| } | ||
|
|
||
| if (style.disabled !== null) { | ||
| conditions.push(`state?.isDisabled === ${style.disabled}`) | ||
| } | ||
|
|
||
| for (const [attribute, expectedValue] of Object.entries(style.dataAttributes ?? {})) { | ||
| const value = `props?.[${JSON.stringify(attribute)}]` | ||
|
|
||
| if (expectedValue === '"true"' || expectedValue === '"false"') { | ||
| conditions.push(`(${value} === ${expectedValue.slice(1, -1)} || ${value} === ${expectedValue})`) | ||
| } else { | ||
| conditions.push(`${value} === ${expectedValue}`) | ||
|
There was a problem hiding this comment.
The generated data-value comparison inserts the selector value directly into JavaScript source. If the parsed value contains a quote or backslash, it can change the comparison or break the generated module. Escape the value as a JavaScript string before building Knowledge Base Used: CSS compilation and processing |
||
| } | ||
| } | ||
|
|
||
| return `function(rt, props, state, context) { return ${conditions.join(' && ') || 'true'} }` | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,9 @@ | ||
| import type { ColorScheme, Orientation } from '@/common/consts' | ||
| import { Platform } from '@/common/consts' | ||
| import type { MediaCondition, MediaQuery, QueryFeatureFor_MediaFeatureId } from 'lightningcss' | ||
| import type { ProcessorBuilder } from './processor' | ||
| import type { MediaQueryResolver } from './types' | ||
|
|
||
| export class MQ { | ||
| constructor(private readonly Processor: ProcessorBuilder) {} | ||
|
|
||
|
|
@@ -30,44 +28,62 @@ export class MQ { | |
| return | ||
| } | ||
|
|
||
| if (condition) { | ||
| this.processCondition(condition, mq) | ||
| } | ||
| }) | ||
|
|
||
| return mq | ||
| } | ||
|
|
||
| private processCondition(condition: MediaCondition, mq: MediaQueryResolver) { | ||
| if (condition.type === 'operation' && condition.operator === 'and') { | ||
| condition.conditions.forEach(condition => this.processCondition(condition, mq)) | ||
|
Comment on lines
+40
to
+41
There was a problem hiding this comment.
When an Knowledge Base Used: CSS build pipeline |
||
|
|
||
| return | ||
| } | ||
|
|
||
| if (condition.type !== 'feature') { | ||
| return | ||
| } | ||
|
|
||
| if (condition.value.type === 'range') { | ||
| this.processDimensionMediaQuery(condition.value, mq) | ||
| } | ||
|
|
||
| if (condition.value.type === 'plain') { | ||
| this.processPlainMediaQuery(condition.value, mq) | ||
| } | ||
| } | ||
|
|
||
| private processDimensionMediaQuery(query: QueryFeatureFor_MediaFeatureId & { type: 'range' }, mq: MediaQueryResolver) { | ||
| const { name, operator, value } = query | ||
|
|
||
| if (name !== 'width' && name !== 'height') { | ||
| return | ||
| } | ||
|
|
||
| const dimension = name === 'width' ? 'Width' : 'Height' | ||
| const result = this.Processor.CSS.processValue(value) | ||
|
|
||
| if (operator === 'greater-than-equal') { | ||
| mq[`min${dimension}`] = result | ||
| mq[`min${dimension}Operator`] = '>=' | ||
| } | ||
|
|
||
| if (operator === 'greater-than') { | ||
| mq[`min${dimension}`] = result | ||
| mq[`min${dimension}Operator`] = '>' | ||
| } | ||
|
|
||
| if (operator === 'less-than-equal') { | ||
| mq[`max${dimension}`] = result | ||
| mq[`max${dimension}Operator`] = '<=' | ||
| } | ||
|
|
||
| if (operator === 'less-than') { | ||
| mq[`max${dimension}`] = result | ||
| mq[`max${dimension}Operator`] = '<' | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -92,6 +108,12 @@ export class MQ { | |
| return { | ||
| minWidth: 0, | ||
| maxWidth: Number.MAX_VALUE, | ||
| minWidthOperator: null, | ||
| maxWidthOperator: null, | ||
| minHeight: 0, | ||
| maxHeight: Number.MAX_VALUE, | ||
| minHeightOperator: null, | ||
| maxHeightOperator: null, | ||
| platform: null, | ||
| rtl: null, | ||
| important: false, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When a media bound uses
em,generateStyleMatcherputs avarslookup insidematches. The function receives novarsargument, so resolving a class with that bound throws instead of returning a style. Pass the needed value into the matcher.Knowledge Base Used: CSS compilation and processing