diff --git a/src/accent-color.ts b/src/accent-color.ts index 601d4db9f..c6dc13473 100644 --- a/src/accent-color.ts +++ b/src/accent-color.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { ACCENT, COLOR, DASH } from './constants/css-property-keyword'; export class AccentColorStyle extends Style { - static override property = ACCENT + DASH + COLOR; + static override key = ACCENT + DASH + COLOR; } \ No newline at end of file diff --git a/src/align-content.ts b/src/align-content.ts index 2f4beb20e..6c43a3502 100644 --- a/src/align-content.ts +++ b/src/align-content.ts @@ -2,5 +2,5 @@ import { ALIGN, CONTENT, DASH } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class AlignContentStyle extends Style { - static override property = ALIGN + DASH + CONTENT; + static override key = ALIGN + DASH + CONTENT; } \ No newline at end of file diff --git a/src/align-items.ts b/src/align-items.ts index 754d7ab45..9deb4ea11 100644 --- a/src/align-items.ts +++ b/src/align-items.ts @@ -2,5 +2,5 @@ import { ALIGN, DASH, ITEMS } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class AlignItemsStyle extends Style { - static override property = ALIGN + DASH + ITEMS; + static override key = ALIGN + DASH + ITEMS; } \ No newline at end of file diff --git a/src/align-self.ts b/src/align-self.ts index c0ffde1a6..c2ad58751 100644 --- a/src/align-self.ts +++ b/src/align-self.ts @@ -2,5 +2,5 @@ import { ALIGN, DASH, SELF } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class AlignSelfStyle extends Style { - static override property = ALIGN + DASH + SELF; + static override key = ALIGN + DASH + SELF; } \ No newline at end of file diff --git a/src/animation-delay.ts b/src/animation-delay.ts index f3ead9dc1..077fbf031 100644 --- a/src/animation-delay.ts +++ b/src/animation-delay.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class AnimationDelayStyle extends Style { static override prefixes = /^\*delay:/; - static override property = ANIMATION + DASH + DELAY; + static override key = ANIMATION + DASH + DELAY; static override unit = 'ms'; } \ No newline at end of file diff --git a/src/animation-direction.ts b/src/animation-direction.ts index 9382147aa..df3582514 100644 --- a/src/animation-direction.ts +++ b/src/animation-direction.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationDirectionStyle extends Style { static override prefixes = /^\*direction:/; - static override property = ANIMATION + DASH + DIRECTION; + static override key = ANIMATION + DASH + DIRECTION; } \ No newline at end of file diff --git a/src/animation-duration.ts b/src/animation-duration.ts index b6a6d45fd..e8c060aab 100644 --- a/src/animation-duration.ts +++ b/src/animation-duration.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class AnimationDurationStyle extends Style { static override prefixes = /^\*duration:/; - static override property = ANIMATION + DASH + DURATION; + static override key = ANIMATION + DASH + DURATION; static override unit = 'ms'; } \ No newline at end of file diff --git a/src/animation-fill-mode.ts b/src/animation-fill-mode.ts index d83b0dfcd..c6b1ca9fc 100644 --- a/src/animation-fill-mode.ts +++ b/src/animation-fill-mode.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationFillModeStyle extends Style { static override prefixes = /^\*fill-mode:/; - static override property = ANIMATION + DASH + FILL + DASH + MODE; + static override key = ANIMATION + DASH + FILL + DASH + MODE; } \ No newline at end of file diff --git a/src/animation-iteration-count.ts b/src/animation-iteration-count.ts index 5c6fd93ca..c7ba3ac74 100644 --- a/src/animation-iteration-count.ts +++ b/src/animation-iteration-count.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationIterationCountStyle extends Style { static override prefixes = /^\*iteration-count:/; - static override property = ANIMATION + DASH + ITERATION + DASH + COUNT; + static override key = ANIMATION + DASH + ITERATION + DASH + COUNT; } \ No newline at end of file diff --git a/src/animation-name.ts b/src/animation-name.ts index c303c13bf..a872d5925 100644 --- a/src/animation-name.ts +++ b/src/animation-name.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationNameStyle extends Style { static override prefixes = /^\*name:/; - static override property = ANIMATION + DASH + NAME; + static override key = ANIMATION + DASH + NAME; } \ No newline at end of file diff --git a/src/animation-play-state.ts b/src/animation-play-state.ts index d1961d70a..d5e52fcf3 100644 --- a/src/animation-play-state.ts +++ b/src/animation-play-state.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationPlayStateStyle extends Style { static override prefixes = /^\*play-state:/; - static override property = ANIMATION + DASH + PLAY_STATE; + static override key = ANIMATION + DASH + PLAY_STATE; } \ No newline at end of file diff --git a/src/animation-timing-function.ts b/src/animation-timing-function.ts index d391b831a..70fb2a3c4 100644 --- a/src/animation-timing-function.ts +++ b/src/animation-timing-function.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationTimingFunctionStyle extends Style { static override prefixes = /^\*easing:/; - static override property = ANIMATION + DASH + TIMING_FUNCTION; + static override key = ANIMATION + DASH + TIMING_FUNCTION; } \ No newline at end of file diff --git a/src/animation.ts b/src/animation.ts index de6b381d7..57997d305 100644 --- a/src/animation.ts +++ b/src/animation.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class AnimationStyle extends Style { static override symbol = '*'; - static override property = ANIMATION; + static override key = ANIMATION; } \ No newline at end of file diff --git a/src/appearance.ts b/src/appearance.ts index 56c0877a0..61be50fb0 100644 --- a/src/appearance.ts +++ b/src/appearance.ts @@ -1,5 +1,5 @@ import { Style } from '@master/style'; export class AppearanceStyle extends Style { - static override property = 'appearance'; + static override key = 'appearance'; } \ No newline at end of file diff --git a/src/aspect-radio.ts b/src/aspect-radio.ts index d8782dcd9..04ad54d10 100644 --- a/src/aspect-radio.ts +++ b/src/aspect-radio.ts @@ -3,7 +3,7 @@ import { SQUARE, VIDEO, ASPECT, RATIO, DASH } from './constants/css-property-key export class AspectRadioStyle extends Style { static override prefixes = /^aspect:/; - static override property = ASPECT + DASH + RATIO; + static override key = ASPECT + DASH + RATIO; static override unit = ''; static override semantics = { [SQUARE]: '1/1', diff --git a/src/backdrop-filter.ts b/src/backdrop-filter.ts index a76448435..193c7f138 100644 --- a/src/backdrop-filter.ts +++ b/src/backdrop-filter.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class BackdropFilterStyle extends Style { static override prefixes = /^bd:/; - static override property = BACKDROP + DASH + FILTER; + static override key = BACKDROP + DASH + FILTER; } \ No newline at end of file diff --git a/src/background-attachment.ts b/src/background-attachment.ts index 18b520eda..dc0b743ac 100644 --- a/src/background-attachment.ts +++ b/src/background-attachment.ts @@ -3,5 +3,5 @@ import { ATTACHMENT, BACKGROUND, DASH } from './constants/css-property-keyword'; export class BackgroundAttachmentStyle extends Style { static override prefixes = /^(bg-attachment:|(bg|background):(fixed|local|scroll))/; - static override property = BACKGROUND + DASH + ATTACHMENT; + static override key = BACKGROUND + DASH + ATTACHMENT; } \ No newline at end of file diff --git a/src/background-blend-mode.ts b/src/background-blend-mode.ts index f0848d4ab..0d7dfca34 100644 --- a/src/background-blend-mode.ts +++ b/src/background-blend-mode.ts @@ -3,5 +3,5 @@ import { BACKGROUND, BLEND, DASH, MODE } from './constants/css-property-keyword' export class BackgroundBlendModeStyle extends Style { static override prefixes = /^bg-blend:/; - static override property = BACKGROUND + DASH + BLEND + DASH + MODE; + static override key = BACKGROUND + DASH + BLEND + DASH + MODE; } \ No newline at end of file diff --git a/src/background-clip.ts b/src/background-clip.ts index e1bad0907..8c9a79b68 100644 --- a/src/background-clip.ts +++ b/src/background-clip.ts @@ -2,7 +2,7 @@ import { Style } from '@master/style'; export class BackgroundClipStyle extends Style { static override prefixes = /^(bg|background)-clip:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { '-webkit-background-clip': this, 'background-clip': this diff --git a/src/background-color.ts b/src/background-color.ts index 1743bd366..5e04af1c1 100644 --- a/src/background-color.ts +++ b/src/background-color.ts @@ -3,5 +3,5 @@ import { BACKGROUND, COLOR, DASH } from './constants/css-property-keyword'; export class BackgroundColorStyle extends Style { static override prefixes = /^(bg-color:|(bg|background):transparent)/; - static override property = BACKGROUND + DASH + COLOR; + static override key = BACKGROUND + DASH + COLOR; } \ No newline at end of file diff --git a/src/background-image.ts b/src/background-image.ts index a2180a2ca..5a9bb1381 100644 --- a/src/background-image.ts +++ b/src/background-image.ts @@ -3,5 +3,5 @@ import { BACKGROUND, DASH, IMAGE } from './constants/css-property-keyword'; export class BackgroundImageStyle extends Style { static override prefixes = /^bg-image:/; - static override property = BACKGROUND + DASH + IMAGE; + static override key = BACKGROUND + DASH + IMAGE; } \ No newline at end of file diff --git a/src/background-origin.ts b/src/background-origin.ts index 14b8aac02..7d54d7403 100644 --- a/src/background-origin.ts +++ b/src/background-origin.ts @@ -3,5 +3,5 @@ import { BACKGROUND, DASH, ORIGIN } from './constants/css-property-keyword'; export class BackgroundOriginStyle extends Style { static override prefixes = /^bg-origin:/; - static override property = BACKGROUND + DASH + ORIGIN; + static override key = BACKGROUND + DASH + ORIGIN; } \ No newline at end of file diff --git a/src/background-position.ts b/src/background-position.ts index ce6695e0a..55ed31244 100644 --- a/src/background-position.ts +++ b/src/background-position.ts @@ -3,5 +3,5 @@ import { BACKGROUND, DASH, POSITION } from './constants/css-property-keyword'; export class BackgroundPositionStyle extends Style { static override prefixes = /^(bg-position:|(bg|background):(top|bottom|right|left|center))/; - static override property = BACKGROUND + DASH + POSITION; + static override key = BACKGROUND + DASH + POSITION; } \ No newline at end of file diff --git a/src/background-repeat.ts b/src/background-repeat.ts index 816c7d8ca..8213e25b4 100644 --- a/src/background-repeat.ts +++ b/src/background-repeat.ts @@ -3,5 +3,5 @@ import { BACKGROUND, DASH, REPEAT } from './constants/css-property-keyword'; export class BackgroundRepeatStyle extends Style { static override prefixes = /^(bg-repeat:|(bg|background):(repeat|no-repeat|repeat-x|repeat-y))/; - static override property = BACKGROUND + DASH + REPEAT; + static override key = BACKGROUND + DASH + REPEAT; } \ No newline at end of file diff --git a/src/background-size.ts b/src/background-size.ts index 40ebf4877..53a2bb20d 100644 --- a/src/background-size.ts +++ b/src/background-size.ts @@ -3,5 +3,5 @@ import { BACKGROUND, DASH, SIZE } from './constants/css-property-keyword'; export class BackgroundSizeStyle extends Style { static override prefixes = /^(bg-size:|(bg|background):(auto|cover|contain))/; - static override property = BACKGROUND + DASH + SIZE; + static override key = BACKGROUND + DASH + SIZE; } \ No newline at end of file diff --git a/src/background.ts b/src/background.ts index 69bf2c145..61822a5a6 100644 --- a/src/background.ts +++ b/src/background.ts @@ -3,5 +3,5 @@ import { BACKGROUND } from './constants/css-property-keyword'; export class BackgroundStyle extends Style { static override prefixes = /^bg:/; - static override property = BACKGROUND; + static override key = BACKGROUND; } \ No newline at end of file diff --git a/src/border-collapse.ts b/src/border-collapse.ts index a64be1fb8..8894fb8b7 100644 --- a/src/border-collapse.ts +++ b/src/border-collapse.ts @@ -3,5 +3,5 @@ import { BORDER, COLLAPSE, DASH } from './constants/css-property-keyword'; export class BorderCollapseStyle extends Style { static override prefixes = /^b-collapse:/; - static override property = BORDER + DASH + COLLAPSE; + static override key = BORDER + DASH + COLLAPSE; } \ No newline at end of file diff --git a/src/border-color.ts b/src/border-color.ts index c99fffe15..c6a823fdd 100644 --- a/src/border-color.ts +++ b/src/border-color.ts @@ -3,5 +3,5 @@ import { BORDER, COLOR, DASH } from './constants/css-property-keyword'; export class BorderColorStyle extends Style { static override prefixes = /^b-color:/; - static override property = BORDER + DASH + COLOR; + static override key = BORDER + DASH + COLOR; } \ No newline at end of file diff --git a/src/border-radius.ts b/src/border-radius.ts index b583af882..b68eec245 100644 --- a/src/border-radius.ts +++ b/src/border-radius.ts @@ -15,7 +15,7 @@ export class BorderRadiusStyle extends Style { [ROUNDED]: '1e9em', [ROUND]: '50%' } - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { if (this.prefix) { const suffix = this.prefix.slice(1, -1); switch (suffix) { diff --git a/src/border-style.ts b/src/border-style.ts index 57e0ab778..3eea5be05 100644 --- a/src/border-style.ts +++ b/src/border-style.ts @@ -3,5 +3,5 @@ import { BORDER, DASH, STYLE } from './constants/css-property-keyword'; export class BorderStyleStyle extends Style { static override prefixes = /^b-style:|b(order)?:dotted|dashed|solid|double|groove|ridge|inset|outset/; - static override property = BORDER + DASH + STYLE; + static override key = BORDER + DASH + STYLE; } \ No newline at end of file diff --git a/src/border-width.ts b/src/border-width.ts index 45cc8e86e..6bda552de 100644 --- a/src/border-width.ts +++ b/src/border-width.ts @@ -3,5 +3,5 @@ import { BORDER, DASH, WIDTH } from './constants/css-property-keyword'; export class BorderWidthStyle extends Style { static override prefixes = /^b-width:|b(order)?:[0-9]((?!;).)*$/; - static override property = BORDER + DASH + WIDTH; + static override key = BORDER + DASH + WIDTH; } \ No newline at end of file diff --git a/src/border.ts b/src/border.ts index e6b5ebf66..883c0579e 100644 --- a/src/border.ts +++ b/src/border.ts @@ -3,5 +3,5 @@ import { BORDER } from './constants/css-property-keyword'; export class BorderStyle extends Style { static override prefixes = /^b:/; - static override property = BORDER; + static override key = BORDER; } \ No newline at end of file diff --git a/src/box-decoration-break.ts b/src/box-decoration-break.ts index 976aa2389..37afa816d 100644 --- a/src/box-decoration-break.ts +++ b/src/box-decoration-break.ts @@ -3,5 +3,5 @@ import { BOX, BREAK, DASH, DECORATION } from './constants/css-property-keyword'; export class BoxDecorationBreakStyle extends Style { static override prefixes = /^box:(slice|clone)/; - static override property = BOX + DASH + DECORATION + DASH + BREAK; + static override key = BOX + DASH + DECORATION + DASH + BREAK; } \ No newline at end of file diff --git a/src/box-shadow.ts b/src/box-shadow.ts index c46e4a0ee..dcb6e713b 100644 --- a/src/box-shadow.ts +++ b/src/box-shadow.ts @@ -3,5 +3,5 @@ import { BOX, DASH, SHADOW } from './constants/css-property-keyword'; export class BoxShadowStyle extends Style { static override prefixes = /^shadow:/; - static override property = BOX + DASH + SHADOW; + static override key = BOX + DASH + SHADOW; } \ No newline at end of file diff --git a/src/box-sizing.ts b/src/box-sizing.ts index acff24267..c2ad1a6cf 100644 --- a/src/box-sizing.ts +++ b/src/box-sizing.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class BoxSizingStyle extends Style { static override prefixes = /^box:(content|border)/; - static override property = BOX + DASH + SIZING; + static override key = BOX + DASH + SIZING; static override values = { content: CONTENT + DASH + BOX, border: BORDER + DASH + BOX diff --git a/src/break-after.ts b/src/break-after.ts index 12b018592..802f98ccd 100644 --- a/src/break-after.ts +++ b/src/break-after.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { AFTER, BREAK, DASH } from './constants/css-property-keyword'; export class BreakAfterStyle extends Style { - static override property = BREAK + DASH + AFTER; + static override key = BREAK + DASH + AFTER; } \ No newline at end of file diff --git a/src/break-before.ts b/src/break-before.ts index 38328d11e..48448aba7 100644 --- a/src/break-before.ts +++ b/src/break-before.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { BEFORE, BREAK, DASH } from './constants/css-property-keyword'; export class BreakBeforeStyle extends Style { - static override property = BREAK + DASH + BEFORE; + static override key = BREAK + DASH + BEFORE; } \ No newline at end of file diff --git a/src/break-inside.ts b/src/break-inside.ts index 87ccc6d07..e9668d140 100644 --- a/src/break-inside.ts +++ b/src/break-inside.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { BREAK, DASH, INSIDE } from './constants/css-property-keyword'; export class BreakInsideStyle extends Style { - static override property = BREAK + DASH + INSIDE; + static override key = BREAK + DASH + INSIDE; } \ No newline at end of file diff --git a/src/caret-color.ts b/src/caret-color.ts index 9d9f39a98..7b7d791ca 100644 --- a/src/caret-color.ts +++ b/src/caret-color.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { CARET, COLOR, DASH } from './constants/css-property-keyword'; export class CaretColorStyle extends Style { - static override property = CARET + DASH + COLOR; + static override key = CARET + DASH + COLOR; } \ No newline at end of file diff --git a/src/clear.ts b/src/clear.ts index 90d07e059..cd3e3bf69 100644 --- a/src/clear.ts +++ b/src/clear.ts @@ -2,5 +2,5 @@ import { CLEAR } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class ClearStyle extends Style { - static override property = CLEAR; + static override key = CLEAR; } \ No newline at end of file diff --git a/src/column-span.ts b/src/column-span.ts index a95dc6cc1..8e1e16f0e 100644 --- a/src/column-span.ts +++ b/src/column-span.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class ColumnSpanStyle extends Style { static override prefixes = /^col-span:/; - static override property = COLUMN + DASH + SPAN; + static override key = COLUMN + DASH + SPAN; } \ No newline at end of file diff --git a/src/content.ts b/src/content.ts index a9a39558b..1b8c7109c 100644 --- a/src/content.ts +++ b/src/content.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { CONTENT } from './constants/css-property-keyword'; export class ContentStyle extends Style { - static override property = CONTENT; + static override key = CONTENT; } \ No newline at end of file diff --git a/src/cursor.ts b/src/cursor.ts index 2bc455cbc..3da2c60d4 100644 --- a/src/cursor.ts +++ b/src/cursor.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { CURSOR } from './constants/css-property-keyword'; export class CursorStyle extends Style { - static override property = CURSOR; + static override key = CURSOR; } \ No newline at end of file diff --git a/src/display.ts b/src/display.ts index 7d5e0687b..0ecf30c78 100644 --- a/src/display.ts +++ b/src/display.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class DisplayStyle extends Style { static override prefixes = /^d:/; - static override property = DISPLAY; + static override key = DISPLAY; static override semantics = { 'hidden': NONE } diff --git a/src/fill.ts b/src/fill.ts index fa42ca77e..f19507638 100644 --- a/src/fill.ts +++ b/src/fill.ts @@ -2,5 +2,5 @@ import { FILL } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FillStyle extends Style { - static override property = FILL; + static override key = FILL; } \ No newline at end of file diff --git a/src/filter.ts b/src/filter.ts index 97bee508d..18dc45543 100644 --- a/src/filter.ts +++ b/src/filter.ts @@ -2,5 +2,5 @@ import { FILTER } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FilterStyle extends Style { - static override property = FILTER; + static override key = FILTER; } \ No newline at end of file diff --git a/src/flex-basis.ts b/src/flex-basis.ts index 30df016e8..a41e7ecf6 100644 --- a/src/flex-basis.ts +++ b/src/flex-basis.ts @@ -2,6 +2,6 @@ import { BASIS, DASH, FLEX, SIZING_VALUES } from './constants/css-property-keywo import { Style } from '@master/style'; export class FlexBasisStyle extends Style { - static override property = FLEX + DASH + BASIS; + static override key = FLEX + DASH + BASIS; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/flex-direction.ts b/src/flex-direction.ts index 73b8a3303..dfacbdad8 100644 --- a/src/flex-direction.ts +++ b/src/flex-direction.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class FlexDirectionStyle extends Style { static override prefixes = /^flex:((row|col|column)(-reverse)?)/; - static override property = FLEX + DASH + DIRECTION; + static override key = FLEX + DASH + DIRECTION; static override values = { col: COLUMN, 'col-reverse': COLUMN + DASH + REVERSE diff --git a/src/flex-grow.ts b/src/flex-grow.ts index b14ffcb13..5a26063bc 100644 --- a/src/flex-grow.ts +++ b/src/flex-grow.ts @@ -2,5 +2,5 @@ import { DASH, FLEX, GROW } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FlexGrowStyle extends Style { - static override property = FLEX + DASH + GROW; + static override key = FLEX + DASH + GROW; } \ No newline at end of file diff --git a/src/flex-shrink.ts b/src/flex-shrink.ts index 171dba9fc..d52d9923f 100644 --- a/src/flex-shrink.ts +++ b/src/flex-shrink.ts @@ -2,5 +2,5 @@ import { DASH, FLEX, SHRINK } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FlexShrinkStyle extends Style { - static override property = FLEX + DASH + SHRINK; + static override key = FLEX + DASH + SHRINK; } \ No newline at end of file diff --git a/src/flex-wrap.ts b/src/flex-wrap.ts index 9fc118806..baa1ac2d6 100644 --- a/src/flex-wrap.ts +++ b/src/flex-wrap.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class FlexWrapStyle extends Style { static override prefixes = /^flex:(wrap(-reverse)?|nowrap)/; - static override property = FLEX + DASH + WRAP; + static override key = FLEX + DASH + WRAP; } \ No newline at end of file diff --git a/src/flex.ts b/src/flex.ts index d6a271691..1428c6da5 100644 --- a/src/flex.ts +++ b/src/flex.ts @@ -2,5 +2,5 @@ import { FLEX } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FlexStyle extends Style { - static override property = FLEX; + static override key = FLEX; } \ No newline at end of file diff --git a/src/float.ts b/src/float.ts index a20333d16..657a100b0 100644 --- a/src/float.ts +++ b/src/float.ts @@ -2,5 +2,5 @@ import { FLOAT } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class FloatStyle extends Style { - static override property = FLOAT; + static override key = FLOAT; } \ No newline at end of file diff --git a/src/font-color.ts b/src/font-color.ts index 5dd252a06..7c5407a1e 100644 --- a/src/font-color.ts +++ b/src/font-color.ts @@ -4,5 +4,5 @@ import { Style } from '@master/style'; export class FontColorStyle extends Style { static override prefixes = /^((f(ont)?-)?color:)/; static override colorStarts = 'f(ont)?:'; - static override property = COLOR; + static override key = COLOR; } \ No newline at end of file diff --git a/src/font-family.ts b/src/font-family.ts index 1ac3705ff..2e51a4388 100644 --- a/src/font-family.ts +++ b/src/font-family.ts @@ -5,7 +5,7 @@ const VAR_F = VAR_START + 'f' + DASH; export class FontFamilyStyle extends Style { static override prefixes = /^f-family:/; - static override property = FONT + DASH + FAMILY; + static override key = FONT + DASH + FAMILY; static override values = { mono: VAR_F + MONO + VAR_END, sans: VAR_F + SANS + VAR_END, diff --git a/src/font-size.ts b/src/font-size.ts index f9214ca3c..b500bde06 100644 --- a/src/font-size.ts +++ b/src/font-size.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class FontSizeStyle extends Style { static override prefixes = /^(f-size:|f(ont)?:[0-9]((?!;).)*$)/; - static override property = FONT + DASH + SIZE; + static override key = FONT + DASH + SIZE; } \ No newline at end of file diff --git a/src/font-smoothing.ts b/src/font-smoothing.ts index bb68bddc5..828ea0e27 100644 --- a/src/font-smoothing.ts +++ b/src/font-smoothing.ts @@ -5,7 +5,7 @@ import { Style } from '@master/style'; export class FontSmoothingStyle extends Style { static override prefixes = /^f(ont)?:(smooth|sharp)/; static override unit = ''; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { const isSmooth = this.value === SMOOTH; return { [WEBKIT_PREFIX + FONT + DASH + SMOOTHING]: { diff --git a/src/font-style.ts b/src/font-style.ts index 08aafe21e..813a86102 100644 --- a/src/font-style.ts +++ b/src/font-style.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class FontStyleStyle extends Style { static override prefixes = /^(f-style:|f(ont)?:italic)/; - static override property = FONT + DASH + STYLE; + static override key = FONT + DASH + STYLE; } \ No newline at end of file diff --git a/src/font-variant-numeric.ts b/src/font-variant-numeric.ts index 43851c7c5..82940a3e4 100644 --- a/src/font-variant-numeric.ts +++ b/src/font-variant-numeric.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class FontVariantNumericStyle extends Style { static override prefixes = /^(f-variant-numeric:|f(ont)?:(ordinal|slashed-zero|lining-nums|oldstyle-nums|proportional-nums|tabular-nums|diagonal-fractions|stached-fractions))/; - static override property = FONT + DASH + VARIANT + DASH + NUMERIC; + static override key = FONT + DASH + VARIANT + DASH + NUMERIC; } \ No newline at end of file diff --git a/src/font-weight.ts b/src/font-weight.ts index 5c075762b..072d6b588 100644 --- a/src/font-weight.ts +++ b/src/font-weight.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class FontWeightStyle extends Style { static override prefixes = /^f-weight:|f(ont):(thin|extralight|light|regular|medium|semibold|bold|extrabold|heavy)/; - static override property = FONT + DASH + WEIGHT; + static override key = FONT + DASH + WEIGHT; static override unit = ''; static override values = { thin: 100, diff --git a/src/gap.ts b/src/gap.ts index b82071dba..47a1f84b8 100644 --- a/src/gap.ts +++ b/src/gap.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class GapStyle extends Style { static override prefixes = /^gap(-x|-y)?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { switch (this.prefix[4]) { case X: return { [COLUMN + DASH + GAP]: this }; diff --git a/src/grid-auto-columns.ts b/src/grid-auto-columns.ts index a59896053..a5e0ce4b1 100644 --- a/src/grid-auto-columns.ts +++ b/src/grid-auto-columns.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class GridAutoColumnsStyle extends Style { static override prefixes = /^grid-auto-(columns|cols):/; - static override property = GRID + DASH + AUTO + DASH + COLUMNS; + static override key = GRID + DASH + AUTO + DASH + COLUMNS; } \ No newline at end of file diff --git a/src/grid-auto-flow.ts b/src/grid-auto-flow.ts index 7c4c77494..348470466 100644 --- a/src/grid-auto-flow.ts +++ b/src/grid-auto-flow.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class GridAutoFlowStyle extends Style { static override prefixes = /^grid(-auto)?-flow:/; - static override property = GRID + DASH + AUTO + DASH + FLOW; + static override key = GRID + DASH + AUTO + DASH + FLOW; } \ No newline at end of file diff --git a/src/grid-auto-rows.ts b/src/grid-auto-rows.ts index 7cec696ac..c221804b4 100644 --- a/src/grid-auto-rows.ts +++ b/src/grid-auto-rows.ts @@ -2,6 +2,6 @@ import { AUTO, DASH, GRID, ROWS } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class GridAutoRowsStyle extends Style { - static override property = GRID + DASH + AUTO + DASH + ROWS; + static override key = GRID + DASH + AUTO + DASH + ROWS; } \ No newline at end of file diff --git a/src/grid-column.ts b/src/grid-column.ts index 89eea5db2..05e6e58bb 100644 --- a/src/grid-column.ts +++ b/src/grid-column.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class GridColumnStyle extends Style { static override prefixes = /^grid-col(umn)?(-span)?:/; - static override property = GRID + DASH + COLUMN; + static override key = GRID + DASH + COLUMN; static override unit = ''; override get parseValue() { return this.prefix.slice(-5, -1) === 'span' && this.value !== 'auto' diff --git a/src/grid-columns.ts b/src/grid-columns.ts index 490ee4998..cd3b6e144 100644 --- a/src/grid-columns.ts +++ b/src/grid-columns.ts @@ -4,7 +4,7 @@ import { Style } from '@master/style'; export class GridColumnsStyle extends Style { static override prefixes = /^grid-col(umn)?s:/; static override unit = ''; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { [DISPLAY]: { ...this, value: GRID }, [GRID + DASH + TEMPLATE + DASH + COLUMNS]: { diff --git a/src/grid-row.ts b/src/grid-row.ts index 778bc4b2b..cacb362c4 100644 --- a/src/grid-row.ts +++ b/src/grid-row.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class GridRowStyle extends Style { static override prefixes = /^grid-row(-span)?:/; - static override property = GRID + DASH + ROW; + static override key = GRID + DASH + ROW; static override unit = ''; override get parseValue() { return this.prefix.slice(-5, -1) === 'span' && this.value !== 'auto' diff --git a/src/grid-rows.ts b/src/grid-rows.ts index 2696fbc86..7c68bd474 100644 --- a/src/grid-rows.ts +++ b/src/grid-rows.ts @@ -4,7 +4,7 @@ import { Style } from '@master/style'; export class GridRowsStyle extends Style { static override prefixes = /^grid-rows:/; static override unit = ''; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { [DISPLAY]: { ...this, value: GRID }, [GRID + DASH + AUTO + DASH + FLOW]: { ...this, value: COLUMN }, diff --git a/src/height.ts b/src/height.ts index e676a437f..1a18e2c84 100644 --- a/src/height.ts +++ b/src/height.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class HeightStyle extends Style { static override prefixes = /^h:/; - static override property = HEIGHT; + static override key = HEIGHT; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/isolation.ts b/src/isolation.ts index eff47623f..578da2bf7 100644 --- a/src/isolation.ts +++ b/src/isolation.ts @@ -2,7 +2,7 @@ import { ISOLATE, ISOLATION } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class IsolationStyle extends Style { - static override property = ISOLATION; + static override key = ISOLATION; static override semantics = { isolate: ISOLATE } diff --git a/src/justify-content.ts b/src/justify-content.ts index 04686a8fc..b243bd88b 100644 --- a/src/justify-content.ts +++ b/src/justify-content.ts @@ -2,6 +2,6 @@ import { CONTENT, DASH, JUSTIFY } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class JustifyContentStyle extends Style { - static override property = JUSTIFY + DASH + CONTENT; + static override key = JUSTIFY + DASH + CONTENT; } \ No newline at end of file diff --git a/src/justify-items.ts b/src/justify-items.ts index d3d119611..bbba22f02 100644 --- a/src/justify-items.ts +++ b/src/justify-items.ts @@ -2,6 +2,6 @@ import { DASH, ITEMS, JUSTIFY } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class JustifyItemsStyle extends Style { - static override property = JUSTIFY + DASH + ITEMS; + static override key = JUSTIFY + DASH + ITEMS; } \ No newline at end of file diff --git a/src/justify-self.ts b/src/justify-self.ts index 70a2b644f..7471eeb5a 100644 --- a/src/justify-self.ts +++ b/src/justify-self.ts @@ -2,5 +2,5 @@ import { DASH, JUSTIFY, SELF } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class JustifySelfStyle extends Style { - static override property = JUSTIFY + DASH + SELF; + static override key = JUSTIFY + DASH + SELF; } \ No newline at end of file diff --git a/src/letter-spacing.ts b/src/letter-spacing.ts index b0ff98f59..1313b11c3 100644 --- a/src/letter-spacing.ts +++ b/src/letter-spacing.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class LetterSpacingStyle extends Style { static override prefixes = /^ls:/; - static override property = LETTER_SPACING; + static override key = LETTER_SPACING; static override unit = 'em'; } \ No newline at end of file diff --git a/src/line-height.ts b/src/line-height.ts index 4d6556a49..a54d4322b 100644 --- a/src/line-height.ts +++ b/src/line-height.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class LineHeightStyle extends Style { static override prefixes = /^lh:/; - static override property = LINE + DASH + HEIGHT; + static override key = LINE + DASH + HEIGHT; static override unit = ''; } \ No newline at end of file diff --git a/src/lines.ts b/src/lines.ts index e24c5e2b5..fd06c025b 100644 --- a/src/lines.ts +++ b/src/lines.ts @@ -5,7 +5,7 @@ import { Style } from '@master/style'; export class LinesStyle extends Style { static override prefixes = /^lines:/; static override unit = ''; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { overflow: { ...this, value: HIDDEN }, display: { ...this, value: WEBKIT_PREFIX + BOX }, diff --git a/src/list-style-position.ts b/src/list-style-position.ts index 8d22b50c3..c6b9ef67d 100644 --- a/src/list-style-position.ts +++ b/src/list-style-position.ts @@ -2,5 +2,5 @@ import { DASH, LIST, POSITION, STYLE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class ListStylePositionStyle extends Style { - static override property = LIST + DASH + STYLE + DASH + POSITION; + static override key = LIST + DASH + STYLE + DASH + POSITION; } \ No newline at end of file diff --git a/src/list-style-type.ts b/src/list-style-type.ts index 11037eefa..c6907056e 100644 --- a/src/list-style-type.ts +++ b/src/list-style-type.ts @@ -2,5 +2,5 @@ import { DASH, LIST, STYLE, TYPE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class ListStyleTypeStyle extends Style { - static override property = LIST + DASH + STYLE + DASH + TYPE; + static override key = LIST + DASH + STYLE + DASH + TYPE; } \ No newline at end of file diff --git a/src/margin.ts b/src/margin.ts index 351d16bcd..de62c077c 100644 --- a/src/margin.ts +++ b/src/margin.ts @@ -2,7 +2,7 @@ import { Style } from '@master/style'; export class MarginStyle extends Style { static override prefixes = /^margin(-(left|right|top|bottom))?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { [this.prefix.slice(0, -1)]: this } diff --git a/src/max-height.ts b/src/max-height.ts index b5fb6fe1f..4ee207e96 100644 --- a/src/max-height.ts +++ b/src/max-height.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class MaxHeightStyle extends Style { static override prefixes = /^max-h:/; - static override property = MAX_HEIGHT; + static override key = MAX_HEIGHT; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/max-width.ts b/src/max-width.ts index f2e351ae5..d4863a0b9 100644 --- a/src/max-width.ts +++ b/src/max-width.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class MaxWidthStyle extends Style { static override prefixes = /^max-w:/; - static override property = MAX_WIDTH; + static override key = MAX_WIDTH; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/min-height.ts b/src/min-height.ts index 1be315579..1146df83c 100644 --- a/src/min-height.ts +++ b/src/min-height.ts @@ -5,6 +5,6 @@ const MIN_HEIGHT_PREFIX = MIN + DASH + H_PREFIX; export class MinHeightStyle extends Style { static override prefixes = /^min-h:/; - static override property = MIN_HEIGHT; + static override key = MIN_HEIGHT; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/min-width.ts b/src/min-width.ts index 84ad794b4..3895bcab6 100644 --- a/src/min-width.ts +++ b/src/min-width.ts @@ -5,6 +5,6 @@ const MIN_W_PREFIX = MIN + DASH + W_PREFIX; export class MinWidthStyle extends Style { static override prefixes = /^min-w:/; - static override property = MIN_WIDTH; + static override key = MIN_WIDTH; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/mix-blend-mode.ts b/src/mix-blend-mode.ts index 47b7503a2..4dd120597 100644 --- a/src/mix-blend-mode.ts +++ b/src/mix-blend-mode.ts @@ -3,5 +3,5 @@ import { BLEND, DASH, MIX, MODE } from './constants/css-property-keyword'; export class MixBlendModeStyle extends Style { static override prefixes = /^blend:/; - static override property = MIX + DASH + BLEND + DASH + MODE; + static override key = MIX + DASH + BLEND + DASH + MODE; } \ No newline at end of file diff --git a/src/object-fit.ts b/src/object-fit.ts index b17fa0973..a9688e892 100644 --- a/src/object-fit.ts +++ b/src/object-fit.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class ObjectFitStyle extends Style { static override prefixes = /^object:(contain|cover|fill|scale-down)/; - static override property = OBJECT + DASH + FIT; + static override key = OBJECT + DASH + FIT; } \ No newline at end of file diff --git a/src/object-position.ts b/src/object-position.ts index 45d740377..63772c38e 100644 --- a/src/object-position.ts +++ b/src/object-position.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class ObjectPositionStyle extends Style { static override prefixes = /^object:(top|bottom|right|left|center)/; - static override property = OBJECT + DASH + POSITION; + static override key = OBJECT + DASH + POSITION; } \ No newline at end of file diff --git a/src/opacity.ts b/src/opacity.ts index f3f615de7..e3b6fb836 100644 --- a/src/opacity.ts +++ b/src/opacity.ts @@ -2,6 +2,6 @@ import { OPACITY } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class OpacityStyle extends Style { - static override property = OPACITY; + static override key = OPACITY; static override unit = ''; } \ No newline at end of file diff --git a/src/order.ts b/src/order.ts index d7b96dcbf..dace78139 100644 --- a/src/order.ts +++ b/src/order.ts @@ -5,7 +5,7 @@ const extreme = '999999'; export class OrderStyle extends Style { static override prefixes = /^o(rder)?:/; - static override property = ORDER; + static override key = ORDER; static override values = { first: '-' + extreme, last: extreme diff --git a/src/outline-color.ts b/src/outline-color.ts index aca6cefd0..3650b83d5 100644 --- a/src/outline-color.ts +++ b/src/outline-color.ts @@ -2,5 +2,5 @@ import { COLOR, DASH, OUTLINE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class OutlineColorStyle extends Style { - static override property = OUTLINE + DASH + COLOR; + static override key = OUTLINE + DASH + COLOR; } \ No newline at end of file diff --git a/src/outline-offset.ts b/src/outline-offset.ts index ef5ea3011..32c9f7bd7 100644 --- a/src/outline-offset.ts +++ b/src/outline-offset.ts @@ -2,5 +2,5 @@ import { DASH, OFFSET, OUTLINE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class OutlineOffsetStyle extends Style { - static override property = OUTLINE + DASH + OFFSET; + static override key = OUTLINE + DASH + OFFSET; } \ No newline at end of file diff --git a/src/outline-style.ts b/src/outline-style.ts index bb5b8f6fa..dbfde7fa2 100644 --- a/src/outline-style.ts +++ b/src/outline-style.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class OutlineStyleStyle extends Style { static override prefixes = /^outline?:dotted|dashed|solid|double|groove|ridge|inset|outset/; - static override property = OUTLINE + DASH + STYLE; + static override key = OUTLINE + DASH + STYLE; } \ No newline at end of file diff --git a/src/outline-width.ts b/src/outline-width.ts index 96265513d..d5615774d 100644 --- a/src/outline-width.ts +++ b/src/outline-width.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class OutlineWidthStyle extends Style { static override prefixes = /^outline:[0-9]((?!;).)*$/; - static override property = OUTLINE + DASH + WIDTH; + static override key = OUTLINE + DASH + WIDTH; } \ No newline at end of file diff --git a/src/overflow.ts b/src/overflow.ts index 38d6649fd..4b154ec2e 100644 --- a/src/overflow.ts +++ b/src/overflow.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class OverflowStyle extends Style { static override prefixes = /^(overflow|ovf)(-x|-y)?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { switch (this.prefix.slice(-2, -1)) { case X: return { 'overflow-x': this }; diff --git a/src/overscroll-behavior.ts b/src/overscroll-behavior.ts index 66e84ae33..f36e3f01c 100644 --- a/src/overscroll-behavior.ts +++ b/src/overscroll-behavior.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class OverscrollBehaviorStyle extends Style { static override prefixes = /^overscroll-behavior(-x|-y)?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { switch (this.prefix.slice(-2, -1)) { case X: return { [OVERSCROLL_BEHAVIOR + DASH + X]: this }; diff --git a/src/package-lock.json b/src/package-lock.json index 9607b462a..1fd7aa03a 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -10,13 +10,13 @@ "url": "https://opencollective.com/master-style" }, "peerDependencies": { - "@master/style": "^1.0.0-alpha.21" + "@master/style": "^1.0.0-alpha.22" } }, "node_modules/@master/style": { - "version": "1.0.0-alpha.21", - "resolved": "https://registry.npmjs.org/@master/style/-/style-1.0.0-alpha.21.tgz", - "integrity": "sha512-vwjSnPdAYay+ytUzfkQTuMDo+5/GNOgSfayUSYjHQD1NzxkrLLuNX2tyAAI0epN/FAHCogkWqvFDirrP3xv0KQ==", + "version": "1.0.0-alpha.22", + "resolved": "https://registry.npmjs.org/@master/style/-/style-1.0.0-alpha.22.tgz", + "integrity": "sha512-5cDrmdO4wal4sgV7FJ+0whHVRAHWeD3aGV2G1ek0iqTWe5LfHjBduoTACH4M3Q3T/lIr+/hbOKUpF7V2rB9qAg==", "peer": true, "funding": { "url": "https://opencollective.com/master-style" @@ -25,9 +25,9 @@ }, "dependencies": { "@master/style": { - "version": "1.0.0-alpha.21", - "resolved": "https://registry.npmjs.org/@master/style/-/style-1.0.0-alpha.21.tgz", - "integrity": "sha512-vwjSnPdAYay+ytUzfkQTuMDo+5/GNOgSfayUSYjHQD1NzxkrLLuNX2tyAAI0epN/FAHCogkWqvFDirrP3xv0KQ==", + "version": "1.0.0-alpha.22", + "resolved": "https://registry.npmjs.org/@master/style/-/style-1.0.0-alpha.22.tgz", + "integrity": "sha512-5cDrmdO4wal4sgV7FJ+0whHVRAHWeD3aGV2G1ek0iqTWe5LfHjBduoTACH4M3Q3T/lIr+/hbOKUpF7V2rB9qAg==", "peer": true } } diff --git a/src/package.json b/src/package.json index baa55e2fb..5e77a418e 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "ui" ], "peerDependencies": { - "@master/style": "^1.0.0-alpha.21" + "@master/style": "^1.0.0-alpha.22" }, "repository": { "type": "git", diff --git a/src/padding.ts b/src/padding.ts index b169e1677..01d5f4138 100644 --- a/src/padding.ts +++ b/src/padding.ts @@ -2,7 +2,7 @@ import { Style } from '@master/style'; export class PaddingStyle extends Style { static override prefixes = /^padding(-(left|right|top|bottom))?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { [this.prefix.slice(0, -1)]: this } diff --git a/src/place-content.ts b/src/place-content.ts index bee2cb6fc..d6aa76a5c 100644 --- a/src/place-content.ts +++ b/src/place-content.ts @@ -2,5 +2,5 @@ import { CONTENT, DASH, PLACE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class PlaceContentStyle extends Style { - static override property = PLACE + DASH + CONTENT; + static override key = PLACE + DASH + CONTENT; } \ No newline at end of file diff --git a/src/place-items.ts b/src/place-items.ts index 7fee776ef..d3c3a9d65 100644 --- a/src/place-items.ts +++ b/src/place-items.ts @@ -2,5 +2,5 @@ import { CONTENT, DASH, ITEMS, PLACE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class PlaceItemsStyle extends Style { - static override property = PLACE + DASH + ITEMS; + static override key = PLACE + DASH + ITEMS; } \ No newline at end of file diff --git a/src/place-self.ts b/src/place-self.ts index 84fcba105..f08a636e0 100644 --- a/src/place-self.ts +++ b/src/place-self.ts @@ -2,5 +2,5 @@ import { DASH, PLACE, SELF } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class PlaceSelfStyle extends Style { - static override property = PLACE + DASH + SELF; + static override key = PLACE + DASH + SELF; } \ No newline at end of file diff --git a/src/placement.ts b/src/placement.ts index 728f77598..a72beea9e 100644 --- a/src/placement.ts +++ b/src/placement.ts @@ -12,7 +12,7 @@ export class PlacementStyle extends Style { center: { right: 0, left: 0, 'margin-left': AUTO, 'margin-right': AUTO }, middle: { top: 0, bottom: 0, 'margin-top': AUTO, 'margin-bottom': AUTO } } - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { const propertyName = this.prefix.slice(0, -1); switch (propertyName) { case TOP: diff --git a/src/pointer-events.ts b/src/pointer-events.ts index db227477b..dca5c3438 100644 --- a/src/pointer-events.ts +++ b/src/pointer-events.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { DASH, EVENTS, POINTERS } from './constants/css-property-keyword'; export class PointerEventsStyle extends Style { - static override property = POINTERS + DASH + EVENTS; + static override key = POINTERS + DASH + EVENTS; } \ No newline at end of file diff --git a/src/position.ts b/src/position.ts index 406322701..56986d2da 100644 --- a/src/position.ts +++ b/src/position.ts @@ -2,7 +2,7 @@ import { ABSOLUTE, POSITION, RELATIVE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class PositionStyle extends Style { - static override property = POSITION; + static override key = POSITION; static override values = { 'abs': ABSOLUTE, 'rel': RELATIVE diff --git a/src/resize.ts b/src/resize.ts index 8a6ba596d..3ddc4aa4b 100644 --- a/src/resize.ts +++ b/src/resize.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { RESIZE } from './constants/css-property-keyword'; export class ResizeStyle extends Style { - static override property = RESIZE; + static override key = RESIZE; } \ No newline at end of file diff --git a/src/scroll-behavior.ts b/src/scroll-behavior.ts index 57028025e..c9da45d46 100644 --- a/src/scroll-behavior.ts +++ b/src/scroll-behavior.ts @@ -2,5 +2,5 @@ import { BEHAVIOR, DASH, SCROLL } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class ScrollBehaviorStyle extends Style { - static override property = SCROLL + DASH + BEHAVIOR; + static override key = SCROLL + DASH + BEHAVIOR; } \ No newline at end of file diff --git a/src/scroll-margin.ts b/src/scroll-margin.ts index 0646486a1..fdad4a274 100644 --- a/src/scroll-margin.ts +++ b/src/scroll-margin.ts @@ -4,7 +4,7 @@ import { B, BOTTOM, L, LEFT, R, RIGHT, T, TOP, X, Y } from './constants/directio export class ScrollMarginStyle extends Style { static override prefixes = /^scroll-(m(x|y|t|b|l|r)|m(argin)?(-(top|bottom|left|right))?):/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { if (this.prefix.slice(-3, -2) === 'm') { const SCROLL_MARGIN_PREFIX = SCROLL + DASH + MARGIN + DASH, SCROLL_MARGIN_LEFT = SCROLL_MARGIN_PREFIX + LEFT, diff --git a/src/scroll-padding.ts b/src/scroll-padding.ts index 7a6c6823e..8a8486378 100644 --- a/src/scroll-padding.ts +++ b/src/scroll-padding.ts @@ -4,7 +4,7 @@ import { B, BOTTOM, L, LEFT, R, RIGHT, T, TOP, X, Y } from './constants/directio export class ScrollPaddingStyle extends Style { static override prefixes = /^scroll-(p(x|y|t|b|l|r)|p(adding)?(-(top|bottom|left|right))?):/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { if (this.prefix.slice(-3, -2) === 'p') { const SCROLL_PADDING_PREFIX = SCROLL + DASH + PADDING + DASH, SCROLL_PADDING_LEFT = SCROLL_PADDING_PREFIX + LEFT, diff --git a/src/scroll-snap-align.ts b/src/scroll-snap-align.ts index 69f1e99fe..522fdb7d9 100644 --- a/src/scroll-snap-align.ts +++ b/src/scroll-snap-align.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { ALIGN, DASH, SCROLL, SNAP } from './constants/css-property-keyword'; export class ScrollSnapAlignStyle extends Style { - static override property = SCROLL + DASH + SNAP + DASH + ALIGN; + static override key = SCROLL + DASH + SNAP + DASH + ALIGN; } \ No newline at end of file diff --git a/src/scroll-snap-stop.ts b/src/scroll-snap-stop.ts index 9811080a0..152bd9a31 100644 --- a/src/scroll-snap-stop.ts +++ b/src/scroll-snap-stop.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { DASH, SCROLL, SNAP, STOP } from './constants/css-property-keyword'; export class ScrollSnapStopStyle extends Style { - static override property = SCROLL + DASH + SNAP + DASH + STOP; + static override key = SCROLL + DASH + SNAP + DASH + STOP; } \ No newline at end of file diff --git a/src/scroll-snap-type.ts b/src/scroll-snap-type.ts index 4966604a7..e3edc05da 100644 --- a/src/scroll-snap-type.ts +++ b/src/scroll-snap-type.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { DASH, SCROLL, SNAP, TYPE } from './constants/css-property-keyword'; export class ScrollSnapTypeStyle extends Style { - static override property = SCROLL + DASH + SNAP + DASH + TYPE; + static override key = SCROLL + DASH + SNAP + DASH + TYPE; } \ No newline at end of file diff --git a/src/spacing.ts b/src/spacing.ts index f12aa6e6d..84e6ef206 100644 --- a/src/spacing.ts +++ b/src/spacing.ts @@ -4,7 +4,7 @@ import { B, BOTTOM, L, LEFT, R, RIGHT, T, TOP, X, Y } from './constants/directio export class SpacingStyle extends Style { static override prefixes = /^(p|m)(x|y|t|b|l|r)?:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { const charAt1 = this.prefix[0]; const SPACING = charAt1 === 'm' ? MARGIN : PADDING; const SPACING_LEFT = SPACING + DASH + LEFT; diff --git a/src/stroke-width.ts b/src/stroke-width.ts index 8622c591c..a598194c1 100644 --- a/src/stroke-width.ts +++ b/src/stroke-width.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class StrokeWidthStyle extends Style { static override prefixes = /^stroke:[0-9]((?!;).)*$/; - static override property = STROKE + DASH + WIDTH; + static override key = STROKE + DASH + WIDTH; } \ No newline at end of file diff --git a/src/stroke.ts b/src/stroke.ts index 8c3d4afda..364290c05 100644 --- a/src/stroke.ts +++ b/src/stroke.ts @@ -2,5 +2,5 @@ import { STROKE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class StrokeStyle extends Style { - static override property = STROKE; + static override key = STROKE; } \ No newline at end of file diff --git a/src/table-layout.ts b/src/table-layout.ts index b9cdf11b5..d28be0d49 100644 --- a/src/table-layout.ts +++ b/src/table-layout.ts @@ -2,5 +2,5 @@ import { DASH, LAYOUT, TABLE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class TableLayoutStyle extends Style { - static override property = TABLE + DASH + LAYOUT; + static override key = TABLE + DASH + LAYOUT; } \ No newline at end of file diff --git a/src/text-align.ts b/src/text-align.ts index 66d3d2b62..1fb0d7893 100644 --- a/src/text-align.ts +++ b/src/text-align.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextAlignStyle extends Style { static override prefixes = /^t(ext)?:(justify|center|left|right)/; - static override property = TEXT + DASH + ALIGN; + static override key = TEXT + DASH + ALIGN; } \ No newline at end of file diff --git a/src/text-decoration-color.ts b/src/text-decoration-color.ts index f5d6ffc02..d052b3b79 100644 --- a/src/text-decoration-color.ts +++ b/src/text-decoration-color.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextDecorationColorStyle extends Style { static override prefixes = /^t-decoration-color:/; - static override property = TEXT + DASH + DECORATION + DASH + COLOR; + static override key = TEXT + DASH + DECORATION + DASH + COLOR; } \ No newline at end of file diff --git a/src/text-decoration-style.ts b/src/text-decoration-style.ts index 64cb74b0b..5d47e45e2 100644 --- a/src/text-decoration-style.ts +++ b/src/text-decoration-style.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextDecorationStyleStyle extends Style { static override prefixes = /^(t-decoration-style:|t(ext)?:(solid|double|dotted|dashed|wavy))/; - static override property = TEXT + DASH + DECORATION + DASH + STYLE; + static override key = TEXT + DASH + DECORATION + DASH + STYLE; } \ No newline at end of file diff --git a/src/text-decoration-thickness.ts b/src/text-decoration-thickness.ts index 83be7231f..5730759ca 100644 --- a/src/text-decoration-thickness.ts +++ b/src/text-decoration-thickness.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class TextDecorationThicknessStyle extends Style { static override prefixes = /^(t-decoration-thickness:|t(ext)?-decoration:[0-9]((?!;).)*$)/; - static override property = TEXT + DASH + DECORATION + DASH + THICKNESS; + static override key = TEXT + DASH + DECORATION + DASH + THICKNESS; static override unit = 'em'; } \ No newline at end of file diff --git a/src/text-decoration.ts b/src/text-decoration.ts index 4e93c408b..b3f9ba05d 100644 --- a/src/text-decoration.ts +++ b/src/text-decoration.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextDecorationStyle extends Style { static override prefixes = /^(t(ext)?-decoration:|t(ext)?:(underline|line-throught))/; - static override property = TEXT + DASH + DECORATION; + static override key = TEXT + DASH + DECORATION; } \ No newline at end of file diff --git a/src/text-indent.ts b/src/text-indent.ts index 188ad8967..5ea82099a 100644 --- a/src/text-indent.ts +++ b/src/text-indent.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextIndentStyle extends Style { static override prefixes = /^t(ext)?-indent:/; - static override property = TEXT + DASH + INDENT; + static override key = TEXT + DASH + INDENT; } \ No newline at end of file diff --git a/src/text-leading.ts b/src/text-leading.ts index 5ce5b753b..2ca80f13e 100644 --- a/src/text-leading.ts +++ b/src/text-leading.ts @@ -4,7 +4,6 @@ import { Style } from '@master/style'; export class TextLeadingStyle extends Style { static override prefixes = /^t(ext)?:leading/; static override fixedPseudo = ':' + FIRST + DASH + LETTER; - // TODO: why get properties override get parseValue() { return { [TEXT + DASH + TRANSFORM]: UPPERCASE diff --git a/src/text-overflow.ts b/src/text-overflow.ts index a054c309b..d2e5ead9a 100644 --- a/src/text-overflow.ts +++ b/src/text-overflow.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextOverflowStyle extends Style { static override prefixes = /^(t(ext)?-(overflow|ovf):|t(ext)?:(ellipsis|clip))/; - static override property = TEXT + DASH + OVERFLOW; + static override key = TEXT + DASH + OVERFLOW; } \ No newline at end of file diff --git a/src/text-shadow.ts b/src/text-shadow.ts index 3bd000e32..ab0292000 100644 --- a/src/text-shadow.ts +++ b/src/text-shadow.ts @@ -3,5 +3,5 @@ import { DASH, SHADOW, TEXT } from './constants/css-property-keyword'; export class TextShadowStyle extends Style { static override prefixes = /^t(ext)?-shadow:/; - static override property = TEXT + DASH + SHADOW; + static override key = TEXT + DASH + SHADOW; } \ No newline at end of file diff --git a/src/text-size.ts b/src/text-size.ts index 74c9f1312..fd4f587e8 100644 --- a/src/text-size.ts +++ b/src/text-size.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class TextSizeStyle extends Style { static override prefixes = /^(t(ext)?:[0-9]((?!;).)*$)/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { [FONT + DASH + SIZE]: this, [LINE + DASH + HEIGHT]: { diff --git a/src/text-transform.ts b/src/text-transform.ts index d62e70fc3..81dd3732b 100644 --- a/src/text-transform.ts +++ b/src/text-transform.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextTransformStyle extends Style { static override prefixes = /^(t-transform:|t(ext)?:(uppercase|lowercase|capitalize))/; - static override property = TEXT + DASH + TRANSFORM; + static override key = TEXT + DASH + TRANSFORM; } \ No newline at end of file diff --git a/src/text-underline-offset.ts b/src/text-underline-offset.ts index 8bb07fde1..d1248596d 100644 --- a/src/text-underline-offset.ts +++ b/src/text-underline-offset.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TextUnderlineOffsetStyle extends Style { static override prefixes = /^t-underline-offset:/; - static override property = TEXT + DASH + UNDERLINE + DASH + OFFSET; + static override key = TEXT + DASH + UNDERLINE + DASH + OFFSET; } \ No newline at end of file diff --git a/src/touch-action.ts b/src/touch-action.ts index 413b5d632..0a788e0eb 100644 --- a/src/touch-action.ts +++ b/src/touch-action.ts @@ -2,5 +2,5 @@ import { Style } from '@master/style'; import { ACTION, DASH, TOUCH } from './constants/css-property-keyword'; export class TouchActionStyle extends Style { - static override property = TOUCH + DASH + ACTION; + static override key = TOUCH + DASH + ACTION; } \ No newline at end of file diff --git a/src/transform-box.ts b/src/transform-box.ts index 61c3d6ef3..eaf3b3758 100644 --- a/src/transform-box.ts +++ b/src/transform-box.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransformBoxStyle extends Style { static override prefixes = /^transform:(content-box|border-box|fill-box|stroke-box|view-box)/; - static override property = TRANSFORM + DASH + BOX; + static override key = TRANSFORM + DASH + BOX; } \ No newline at end of file diff --git a/src/transform-origin.ts b/src/transform-origin.ts index f12cff8ab..6d9713f3e 100644 --- a/src/transform-origin.ts +++ b/src/transform-origin.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransformOriginStyle extends Style { static override prefixes = /^transform:(top|bottom|right|left|center)/; - static override property = TRANSFORM + DASH + ORIGIN; + static override key = TRANSFORM + DASH + ORIGIN; } \ No newline at end of file diff --git a/src/transform-style.ts b/src/transform-style.ts index 77f15dfa6..eaa519b68 100644 --- a/src/transform-style.ts +++ b/src/transform-style.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransformStyleStyle extends Style { static override prefixes = /^transform:(flat|preserve-3d)/; - static override property = TRANSFORM + DASH + STYLE; + static override key = TRANSFORM + DASH + STYLE; } \ No newline at end of file diff --git a/src/transform.ts b/src/transform.ts index 2d0c491d0..58ffa4500 100644 --- a/src/transform.ts +++ b/src/transform.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class TransformStyle extends Style { static override prefixes = /^(translate|scale|skew|rotate|perspective|matrix)(3d|X|Y|Z)?\(/; - static override property = TRANSFORM; + static override key = TRANSFORM; static override unit = ''; override get parseValue() { return this.value.replace( diff --git a/src/transition-delay.ts b/src/transition-delay.ts index f70397c1e..e51ea5cf6 100644 --- a/src/transition-delay.ts +++ b/src/transition-delay.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class TransitionDelayStyle extends Style { static override prefixes = /^~delay:/; - static override property = TRANSITION + DASH + DELAY; + static override key = TRANSITION + DASH + DELAY; static override unit = 'ms'; } \ No newline at end of file diff --git a/src/transition-duration.ts b/src/transition-duration.ts index eb86d20db..be15e2369 100644 --- a/src/transition-duration.ts +++ b/src/transition-duration.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class TransitionDurationStyle extends Style { static override prefixes = /^~duration:/; - static override property = TRANSITION + DASH + DURATION; + static override key = TRANSITION + DASH + DURATION; static override unit = 'ms'; } \ No newline at end of file diff --git a/src/transition-property.ts b/src/transition-property.ts index 4eef09fa4..32a8f63a6 100644 --- a/src/transition-property.ts +++ b/src/transition-property.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransitionPropertyStyle extends Style { static override prefixes = /^~property:/; - static override property = TRANSITION + DASH + PROPERTY; + static override key = TRANSITION + DASH + PROPERTY; } \ No newline at end of file diff --git a/src/transition-timing-function.ts b/src/transition-timing-function.ts index 2173f85c5..f9c492f24 100644 --- a/src/transition-timing-function.ts +++ b/src/transition-timing-function.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransitionTimingFunctionStyle extends Style { static override prefixes = /^~easing:/; - static override property = TRANSITION + DASH + TIMING_FUNCTION; + static override key = TRANSITION + DASH + TIMING_FUNCTION; } \ No newline at end of file diff --git a/src/transition.ts b/src/transition.ts index fa5cf87c5..e10d38308 100644 --- a/src/transition.ts +++ b/src/transition.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class TransitionStyle extends Style { static override symbol = '~'; - static override property = TRANSITION; + static override key = TRANSITION; } \ No newline at end of file diff --git a/src/user-drag.ts b/src/user-drag.ts index 3b639030b..b86462572 100644 --- a/src/user-drag.ts +++ b/src/user-drag.ts @@ -2,7 +2,7 @@ import { Style } from '@master/style'; export class UserDragStyle extends Style { static override prefixes = /^user-drag:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { 'user-drag': this, '-webkit-user-drag': this diff --git a/src/user-select.ts b/src/user-select.ts index 0878a44ac..0a5aaff11 100644 --- a/src/user-select.ts +++ b/src/user-select.ts @@ -2,7 +2,7 @@ import { Style } from '@master/style'; export class UserSelectStyle extends Style { static override prefixes = /^user-select:/; - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { 'user-select': this, '-webkit-user-select': this diff --git a/src/variable.ts b/src/variable.ts index f0aaf01b1..2d0611b44 100644 --- a/src/variable.ts +++ b/src/variable.ts @@ -3,7 +3,7 @@ import { Style } from '@master/style'; export class VariableStyle extends Style { static override prefixes = /^\$.*:/; static override unit = ''; // don't use 'rem' as default, because css variable is common API - override get properties(): { [key: string]: any } { + override get props(): { [key: string]: any } { return { ['--' + this.prefix.slice(1, -1)]: this } diff --git a/src/vertical-align.ts b/src/vertical-align.ts index 7804f769f..3b00d87dc 100644 --- a/src/vertical-align.ts +++ b/src/vertical-align.ts @@ -3,5 +3,5 @@ import { Style } from '@master/style'; export class VerticalAlignStyle extends Style { static override prefixes = /^v(ertical)?(-align)?:/; - static override property = VERTICAL + DASH + ALIGN; + static override key = VERTICAL + DASH + ALIGN; } \ No newline at end of file diff --git a/src/visibility.ts b/src/visibility.ts index 7e99c2359..c4f714ea9 100644 --- a/src/visibility.ts +++ b/src/visibility.ts @@ -2,7 +2,7 @@ import { HIDDEN, INVISIBLE, VISIBILITY, VISIBLE } from './constants/css-property import { Style } from '@master/style'; export class VisibilityStyle extends Style { - static override property = VISIBILITY; + static override key = VISIBILITY; static override semantics = { visible: VISIBLE, invisible: HIDDEN diff --git a/src/white-space.ts b/src/white-space.ts index 4edb93d95..9c267f212 100644 --- a/src/white-space.ts +++ b/src/white-space.ts @@ -2,7 +2,7 @@ import { BREAK, DASH, SPACE, WHITE } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class WhiteSpaceStyle extends Style { - static override property = WHITE + DASH + SPACE; + static override key = WHITE + DASH + SPACE; static override unit = ''; static override semantics = { // break-spaces diff --git a/src/width.ts b/src/width.ts index 1c5b64b64..11c517fe3 100644 --- a/src/width.ts +++ b/src/width.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class WidthStyle extends Style { static override prefixes = /^w:/; - static override property = WIDTH; + static override key = WIDTH; static override values = SIZING_VALUES; } \ No newline at end of file diff --git a/src/will-change.ts b/src/will-change.ts index 787f131dc..669171380 100644 --- a/src/will-change.ts +++ b/src/will-change.ts @@ -1,5 +1,5 @@ import { Style } from '@master/style'; export class WillChangeStyle extends Style { - static override property = 'will-change'; + static override key = 'will-change'; } \ No newline at end of file diff --git a/src/word-break.ts b/src/word-break.ts index 4ba49ded4..7a867856a 100644 --- a/src/word-break.ts +++ b/src/word-break.ts @@ -2,7 +2,7 @@ import { BREAK, DASH, HIDDEN, WORD } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class WordBreakStyle extends Style { - static override property = WORD + DASH + BREAK; + static override key = WORD + DASH + BREAK; static override unit = ''; static override semantics = { 'break-words': { diff --git a/src/word-spacing.ts b/src/word-spacing.ts index 8f4c58247..5569acf2e 100644 --- a/src/word-spacing.ts +++ b/src/word-spacing.ts @@ -2,5 +2,5 @@ import { DASH, SPACING, WORD } from './constants/css-property-keyword'; import { Style } from '@master/style'; export class WordSpacingStyle extends Style { - static override property = WORD + DASH + SPACING; + static override key = WORD + DASH + SPACING; } \ No newline at end of file diff --git a/src/z-index.ts b/src/z-index.ts index 077235e55..55852d0a2 100644 --- a/src/z-index.ts +++ b/src/z-index.ts @@ -3,6 +3,6 @@ import { Style } from '@master/style'; export class ZIndexStyle extends Style { static override prefixes = /^z:/; - static override property = Z_INDEX; + static override key = Z_INDEX; static override unit = ''; } \ No newline at end of file