Fix style-Tag and Theming-Order (#7057)

public-ui · Nov 14, 2024 · 2a5064b · 2a5064b
2 parents 1fc556f + d68695e
commit 2a5064b
Show file tree

Hide file tree

Showing 48 changed files with 64 additions and 61 deletions.
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -73,7 +73,7 @@
 	},
 	"dependencies": {
 		"@floating-ui/dom": "1.6.11",
-		"adopted-style-sheets": "1.1.5-rc.4",
+		"adopted-style-sheets": "1.1.6-rc.6",
 		"clsx": "2.1.1",
 		"color-convert": "2.0.1",
 		"color-rgba": "2.4.0",
@@ -126,7 +126,7 @@
 		"typescript": "5.6.3"
 	},
 	"peerDependencies": {
-		"adopted-style-sheets": "1.1.5-rc.4"
+		"adopted-style-sheets": "1.1.6-rc.6"
 	},
 	"files": [
 		"assets",

diff --git a/packages/components/src/components/@shared/_kol-alert-mixin.scss b/packages/components/src/components/@shared/_kol-alert-mixin.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
-@import '../style';
 @import '../host-display-block';
+@import '../tooltip/style.scss';
 
 @mixin kol-alert-styles {
 	@layer kol-component {

diff --git a/packages/components/src/components/@shared/_kol-table-stateless-mixin.scss b/packages/components/src/components/@shared/_kol-table-stateless-mixin.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
-@import '../style';
 @import '../host-display-block';
+@import '../tooltip/style.scss';
 
 @mixin kol-table-stateless-styles {
 	@layer kol-component {

diff --git a/packages/components/src/components/abbr/style.css b/packages/components/src/components/abbr/style.css
diff --git a/packages/components/src/components/abbr/style.scss b/packages/components/src/components/abbr/style.scss
@@ -1,5 +1,6 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/alert/style.scss b/packages/components/src/components/alert/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
-@import '../@shared/kol-alert-mixin';
 @import '../style';
+@import '../@shared/kol-alert-mixin';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/badge/style.scss b/packages/components/src/components/badge/style.scss
@@ -1,5 +1,6 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	/* :host implicitly inherits font-size, e.g. for usage in headlines */

diff --git a/packages/components/src/components/button-link/style.scss b/packages/components/src/components/button-link/style.scss
@@ -1 +1,3 @@
+@import '../@shared/mixins';
+@import '../style';
 @import '../link';
diff --git a/packages/components/src/components/button.scss b/packages/components/src/components/button.scss
@@ -1,5 +1,5 @@
 @import './@shared/mixins';
-@import './style';
+@import './tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/button/style.scss b/packages/components/src/components/button/style.scss
@@ -1 +1,3 @@
+@import '../@shared/mixins';
+@import '../style';
 @import '../button';
diff --git a/packages/components/src/components/card/style.scss b/packages/components/src/components/card/style.scss
@@ -1,5 +1,6 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/combobox/style.scss b/packages/components/src/components/combobox/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
 
 @layer kol-component {
@@ -13,10 +14,12 @@
 		&--disabled * {
 			cursor: not-allowed !important;
 		}
+
 		&--disabled {
 			opacity: 0.5;
 			outline: none;
 		}
+
 		&__group {
 			display: inline-flex;
 			align-items: center;

diff --git a/packages/components/src/components/form/style.scss b/packages/components/src/components/form/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 @import '../link';
 
 @include kol-alert-styles;

diff --git a/packages/components/src/components/image/style.scss b/packages/components/src/components/image/style.scss
@@ -1,10 +1,12 @@
 @import '../@shared/mixins';
+@import '../style';
 
 @layer kol-component {
 	:host {
 		display: inline-block;
 		font-size: rem(16);
 	}
+
 	img {
 		max-height: 100%;
 		max-width: 100%;

diff --git a/packages/components/src/components/input-checkbox/style.scss b/packages/components/src/components/input-checkbox/style.scss
@@ -1,8 +1,9 @@
+@import '../@shared/mixins';
+@import '../style';
 @import '../input';
 @import './common';
 @import './button';
 @import './checkbox';
 @import './switch';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
diff --git a/packages/components/src/components/input-color/style.scss b/packages/components/src/components/input-color/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-date/style.scss b/packages/components/src/components/input-date/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-email/style.scss b/packages/components/src/components/input-email/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-file/style.scss b/packages/components/src/components/input-file/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-number/style.scss b/packages/components/src/components/input-number/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-password/style.scss b/packages/components/src/components/input-password/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-radio/style.scss b/packages/components/src/components/input-radio/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input-range/style.scss b/packages/components/src/components/input-range/style.scss
@@ -1,5 +1,5 @@
 @import '../@shared/mixins';
-@import '../@shared/kol-alert-mixin';
+@import '../style';
 @import '../input-line';
 
 @include kol-alert-styles;

diff --git a/packages/components/src/components/input-text/style.scss b/packages/components/src/components/input-text/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/input.scss b/packages/components/src/components/input.scss
@@ -1,4 +1,5 @@
 @import './@shared/mixins';
+@import './@shared/kol-alert-mixin';
 @import './label';
 @import './host-display-block';
 

diff --git a/packages/components/src/components/label.scss b/packages/components/src/components/label.scss
@@ -1,5 +1,3 @@
-@import './style';
-
 @layer kol-component {
 	.required label > span::after,
 	.required legend > span::after {

diff --git a/packages/components/src/components/link-button/style.scss b/packages/components/src/components/link-button/style.scss
@@ -1 +1,3 @@
+@import '../@shared/mixins';
+@import '../style';
 @import '../button';
diff --git a/packages/components/src/components/link.scss b/packages/components/src/components/link.scss
@@ -1,5 +1,5 @@
 @import './@shared/mixins';
-@import './style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/link/style.scss b/packages/components/src/components/link/style.scss
@@ -1 +1,3 @@
+@import '../@shared/mixins';
+@import '../style';
 @import '../link';
diff --git a/packages/components/src/components/nav/style.scss b/packages/components/src/components/nav/style.scss
@@ -1,5 +1,6 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/pagination/style.scss b/packages/components/src/components/pagination/style.scss
@@ -1,5 +1,6 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/popover/component.tsx b/packages/components/src/components/popover/component.tsx
@@ -12,7 +12,6 @@ import type { JSX } from '@stencil/core';
  */
 @Component({
 	tag: 'kol-popover-wc',
-	styleUrl: './style.scss',
 	shadow: false,
 })
 export class KolPopover implements PopoverAPI {

diff --git a/packages/components/src/components/popover/style.scss b/packages/components/src/components/popover/style.scss
@@ -1,5 +1,4 @@
 @import '../@shared/mixins';
-@import '../style';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/select/style.scss b/packages/components/src/components/select/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
-@import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;
 

diff --git a/packages/components/src/components/single-select/style.scss b/packages/components/src/components/single-select/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
 
 @layer kol-component {
@@ -45,6 +46,7 @@
 			&.highlighted {
 				background-color: #f0f0f0;
 			}
+
 			.single-select__listbox--cursor-hidden & {
 				cursor: none !important;
 			}

diff --git a/packages/components/src/components/span/style.scss b/packages/components/src/components/span/style.scss
@@ -1,5 +1,5 @@
-@import '../style';
 @import '../@shared/mixins';
+@import '../style';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/split-button/style.scss b/packages/components/src/components/split-button/style.scss
@@ -1,5 +1,7 @@
 @import '../@shared/mixins';
 @import '../style';
+@import '../popover/style.scss';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/table-stateful/style.scss b/packages/components/src/components/table-stateful/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../@shared/kol-table-stateless-mixin';
 
 @layer kol-component {

diff --git a/packages/components/src/components/table-stateless/style.scss b/packages/components/src/components/table-stateless/style.scss
@@ -1,6 +1,6 @@
 @import '../@shared/mixins';
-@import '../@shared/kol-table-stateless-mixin';
 @import '../style';
+@import '../@shared/kol-table-stateless-mixin';
 @import '../host-display-block';
 
 @include kol-table-stateless-styles;
diff --git a/packages/components/src/components/tabs/style.scss b/packages/components/src/components/tabs/style.scss
@@ -1,6 +1,7 @@
 @import '../@shared/mixins';
 @import '../style';
 @import '../host-display-block';
+@import '../tooltip/style.scss';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/textarea/style.scss b/packages/components/src/components/textarea/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../input-line';
 
 @layer kol-component {

diff --git a/packages/components/src/components/toaster/style.scss b/packages/components/src/components/toaster/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 @import '../@shared/kol-alert-mixin';
 
 @include kol-alert-styles;

diff --git a/packages/components/src/components/tooltip/component.tsx b/packages/components/src/components/tooltip/component.tsx
@@ -13,7 +13,6 @@ import { KolSpanWcTag } from '../../core/component-names';
  */
 @Component({
 	tag: 'kol-tooltip-wc',
-	styleUrl: './style.scss',
 	shadow: false,
 })
 export class KolTooltipWc implements TooltipAPI {

diff --git a/packages/components/src/components/tooltip/style.scss b/packages/components/src/components/tooltip/style.scss
@@ -1,5 +1,4 @@
 @import '../@shared/mixins';
-@import '../style';
 
 @layer kol-component {
 	:host {

diff --git a/packages/components/src/components/tree-item/style.scss b/packages/components/src/components/tree-item/style.scss
@@ -1,4 +1,5 @@
 @import '../@shared/mixins';
+@import '../style';
 
 @layer kol-component {
 	:host {

diff --git a/packages/designer/package.json b/packages/designer/package.json
@@ -50,7 +50,7 @@
 		"@types/prettier": "2.7.3",
 		"@unocss/preset-mini": "0.58.9",
 		"@unocss/webpack": "0.58.9",
-		"adopted-style-sheets": "1.1.5-rc.4",
+		"adopted-style-sheets": "1.1.6-rc.6",
 		"ajv": "8.17.1",
 		"chromedriver": "130.0.1",
 		"cpy-cli": "5.0.0",

diff --git a/packages/samples/react/package.json b/packages/samples/react/package.json
@@ -35,7 +35,7 @@
 		"@types/react-dom": "18.3.1",
 		"@unocss/preset-uno": "0.58.9",
 		"@unocss/webpack": "0.58.9",
-		"adopted-style-sheets": "1.1.5-rc.4",
+		"adopted-style-sheets": "1.1.6-rc.6",
 		"ajv": "8.17.1",
 		"chromedriver": "130.0.1",
 		"cpy-cli": "5.0.0",