From 898fa303ffd20cc2da735b3b17b95984f5595cf9 Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Tue, 1 Jun 2021 18:21:28 +0200 Subject: [PATCH] Rename package names in web-core androidx.compose.web -> org.jetbrains.compose.web androidx.compose.web.elements -> org.jetbrains.compose.web.dom --- .../androidx/compose/web/with-web/App.kt | 4 +- .../src/jsMain/kotlin/modifiers/position.kt | 10 +-- .../src/jsMain/kotlin/Main.kt | 14 ++-- .../src/jsMain/kotlin/ComposeInReactApp.kt | 6 +- .../src/jsMain/kotlin/ReactInComposeApp.kt | 12 +-- .../src/jsMain/kotlin/com/sample/Main.kt | 4 +- .../kotlin/com/sample/components/Card.kt | 8 +- .../kotlin/com/sample/components/Layout.kt | 8 +- .../content/AboutComposeWebLibsSection.kt | 6 +- .../com/sample/content/CodeSamplesSwitcher.kt | 22 +++--- .../kotlin/com/sample/content/CodeSnippets.kt | 4 +- .../kotlin/com/sample/content/Footer.kt | 8 +- .../com/sample/content/GetStartedSection.kt | 4 +- .../kotlin/com/sample/content/Header.kt | 8 +- .../kotlin/com/sample/content/IntroSection.kt | 16 ++-- .../kotlin/com/sample/content/JoinUs.kt | 8 +- .../kotlin/com/sample/style/Stylesheet.kt | 4 +- .../jsMain/kotlin/com/sample/style/WtCard.kt | 2 +- .../jsMain/kotlin/com/sample/style/WtCol.kt | 4 +- .../kotlin/com/sample/style/WtContainer.kt | 2 +- .../kotlin/com/sample/style/WtDisplay.kt | 2 +- .../kotlin/com/sample/style/WtOffest.kt | 2 +- .../jsMain/kotlin/com/sample/style/WtRow.kt | 2 +- .../kotlin/com/sample/style/WtSection.kt | 4 +- .../jsMain/kotlin/com/sample/style/WtText.kt | 4 +- .../web-template/src/main/kotlin/Main.kt | 6 +- .../kotlin/androidx/compose/web/css/CSSKT.kt | 2 +- .../androidx/compose/web/css/CSSTypedOM.kt | 2 +- .../androidx/compose/web/css/CSSUnits.kt | 2 +- .../androidx/compose/web/css/keywords.kt | 2 +- .../kotlin/androidx/compose/web/css/typing.kt | 2 +- .../kotlin/androidx/compose/web/DomApplier.kt | 12 +-- .../compose/web/GlobalSnapshotManager.kt | 4 +- .../compose/web/JsMicrotasksDispatcher.kt | 2 +- .../androidx/compose/web/RenderComposable.kt | 4 +- .../androidx/compose/web/attributes/Attrs.kt | 2 +- .../compose/web/attributes/AttrsBuilder.kt | 6 +- .../web/attributes/EventsListenerBuilder.kt | 30 ++++---- .../web/attributes/PredefinedAttrValues.kt | 2 +- .../web/attributes/WrappedEventListener.kt | 32 ++++---- .../kotlin/androidx/compose/web/css/CSS.kt | 2 +- .../androidx/compose/web/css/CSSBuilder.kt | 4 +- .../androidx/compose/web/css/CSSMediaRule.kt | 2 +- .../androidx/compose/web/css/CSSProperties.kt | 2 +- .../androidx/compose/web/css/CSSRules.kt | 4 +- .../androidx/compose/web/css/CSSUnits.kt | 2 +- .../kotlin/androidx/compose/web/css/Color.kt | 2 +- .../androidx/compose/web/css/StyleBuilder.kt | 2 +- .../androidx/compose/web/css/StyleSheet.kt | 8 +- .../compose/web/css/StyleSheetBuilder.kt | 4 +- .../androidx/compose/web/css/keywords.kt | 2 +- .../compose/web/css/selectors/CSSSelectors.kt | 4 +- .../kotlin/androidx/compose/web/css/typing.kt | 2 +- .../androidx/compose/web/elements/Base.kt | 10 +-- .../compose/web/elements/ElementScope.kt | 2 +- .../androidx/compose/web/elements/Elements.kt | 28 +++---- .../androidx/compose/web/elements/Style.kt | 10 +-- .../compose/web/events/WrappedEvent.kt | 2 +- .../src/jsTest/kotlin/DomSideEffectTests.kt | 4 +- .../src/jsTest/kotlin/InlineStyleTests.kt | 18 ++--- .../jsTest/kotlin/StaticComposableTests.kt | 74 +++++++++---------- web/core/src/jsTest/kotlin/TestUtils.kt | 2 +- .../jsTest/kotlin/elements/AttributesTests.kt | 12 +-- .../src/jsTest/kotlin/elements/EventTests.kt | 8 +- .../src/jsTest/kotlin/elements/TableTests.kt | 32 ++++---- .../kotlin/androidx/compose/web/css/CSS.kt | 2 +- .../androidx/compose/web/css/CSSUnits.kt | 2 +- .../kotlin/androidx/compose/web/css/auto.kt | 2 +- .../kotlin/androidx/compose/web/css/typing.kt | 2 +- .../compose/web/sample/CodeSnippetSamples.kt | 22 +++--- .../compose/web/sample/HighlightJs.kt | 2 +- .../androidx/compose/web/sample/Sample.kt | 74 +++++++++---------- .../compose/web/sample/tests/Common.kt | 8 +- .../compose/web/sample/tests/InputsTests.kt | 12 +-- .../compose/web/sample/tests/TestCases1.kt | 16 ++-- .../androidx/compose/web/with-web/demo.kt | 4 +- web/widgets/src/jsMain/kotlin/Modifier.kt | 12 +-- web/widgets/src/jsMain/kotlin/Styles.kt | 24 +++--- .../jsMain/kotlin/internal/ActualModifier.kt | 4 +- web/widgets/src/jsMain/kotlin/layouts/box.kt | 2 +- .../src/jsMain/kotlin/layouts/button.kt | 2 +- .../src/jsMain/kotlin/layouts/column.kt | 2 +- web/widgets/src/jsMain/kotlin/layouts/row.kt | 2 +- .../src/jsMain/kotlin/layouts/slider.kt | 4 +- web/widgets/src/jsMain/kotlin/layouts/text.kt | 14 ++-- .../src/jsMain/kotlin/modifiers/border.kt | 8 +- .../src/jsMain/kotlin/modifiers/clip.kt | 4 +- .../jsMain/kotlin/modifiers/fillMaxHeight.kt | 4 +- .../jsMain/kotlin/modifiers/fillMaxWidth.kt | 4 +- .../src/jsMain/kotlin/modifiers/offset.kt | 6 +- .../src/jsMain/kotlin/modifiers/size.kt | 6 +- .../src/jsMain/kotlin/modifiers/width.kt | 4 +- web/widgets/src/jsTest/ModifierTests.kt | 2 +- 93 files changed, 385 insertions(+), 385 deletions(-) diff --git a/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt b/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt index 8e0c1f07ab..0490d7924b 100644 --- a/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt +++ b/examples/falling_balls_with_web/src/jsMain/kotlin/androidx/compose/web/with-web/App.kt @@ -1,13 +1,13 @@ package org.jetbrainsc.compose.common.demo -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.renderComposable import kotlinx.browser.document import org.w3c.dom.HTMLElement import org.jetbrains.compose.demo.falling.views.fallingBalls import org.jetbrains.compose.demo.falling.Game import androidx.compose.runtime.remember import kotlinx.browser.window -import androidx.compose.web.css.Style +import org.jetbrains.compose.web.css.Style import org.jetbrains.compose.web.ui.Styles class JsGame : Game() { diff --git a/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt b/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt index 388226f901..decc9ee0a7 100644 --- a/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt +++ b/examples/falling_balls_with_web/src/jsMain/kotlin/modifiers/position.kt @@ -5,11 +5,11 @@ import org.jetbrains.compose.common.ui.Modifier import org.jetbrains.compose.common.foundation.layout.offset import org.jetbrains.compose.common.ui.unit.Dp import org.jetbrains.compose.common.internal.castOrCreate -import androidx.compose.web.css.top -import androidx.compose.web.css.left -import androidx.compose.web.css.px -import androidx.compose.web.css.position -import androidx.compose.web.css.Position +import org.jetbrains.compose.web.css.top +import org.jetbrains.compose.web.css.left +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.position +import org.jetbrains.compose.web.css.Position @Composable actual fun Modifier.position(width: Dp, height: Dp): Modifier = castOrCreate().apply { diff --git a/examples/web-getting-started/src/jsMain/kotlin/Main.kt b/examples/web-getting-started/src/jsMain/kotlin/Main.kt index 074f91e8cd..95d7be667c 100644 --- a/examples/web-getting-started/src/jsMain/kotlin/Main.kt +++ b/examples/web-getting-started/src/jsMain/kotlin/Main.kt @@ -1,13 +1,13 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue -import androidx.compose.web.css.padding -import androidx.compose.web.css.px -import androidx.compose.web.elements.Button -import androidx.compose.web.elements.Div -import androidx.compose.web.elements.Span -import androidx.compose.web.elements.Text -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.css.padding +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.dom.Button +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.Span +import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.renderComposable fun main() { var count: Int by mutableStateOf(0) diff --git a/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt b/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt index e57b27a7ee..7cd8f8e8c4 100644 --- a/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt +++ b/examples/web-with-react/src/jsMain/kotlin/ComposeInReactApp.kt @@ -1,9 +1,9 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.State import androidx.compose.runtime.mutableStateOf -import androidx.compose.web.elements.Div -import androidx.compose.web.elements.Text -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.renderComposable import kotlinx.browser.document import kotlinx.browser.window import kotlinx.css.* diff --git a/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt b/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt index 44858349bd..f1d462b0e6 100644 --- a/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt +++ b/examples/web-with-react/src/jsMain/kotlin/ReactInComposeApp.kt @@ -2,12 +2,12 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import androidx.compose.web.css.margin -import androidx.compose.web.css.percent -import androidx.compose.web.css.px -import androidx.compose.web.css.width -import androidx.compose.web.elements.* -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.css.margin +import org.jetbrains.compose.web.css.percent +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.width +import org.jetbrains.compose.web.dom.* +import org.jetbrains.compose.web.renderComposable import kotlinx.browser.window import org.w3c.dom.HTMLElement import react.RBuilder diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt index 29795fcf53..b7e50a37f8 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/Main.kt @@ -1,7 +1,7 @@ package com.sample -import androidx.compose.web.css.Style -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.css.Style +import org.jetbrains.compose.web.renderComposable import com.sample.components.* import com.sample.content.* import com.sample.style.AppStylesheet diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt index 8282ff404b..987cd379c9 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Card.kt @@ -1,10 +1,10 @@ package com.sample.components import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.ATarget -import androidx.compose.web.attributes.target -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.attributes.ATarget +import org.jetbrains.compose.web.attributes.target +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.style.* diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt index 7f94261cf4..b5b910c445 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/components/Layout.kt @@ -1,10 +1,10 @@ package com.sample.components import androidx.compose.runtime.Composable -import androidx.compose.web.css.* -import androidx.compose.web.elements.Div -import androidx.compose.web.elements.Main -import androidx.compose.web.elements.Section +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.Main +import org.jetbrains.compose.web.dom.Section import com.sample.style.WtContainer import com.sample.style.WtOffsets import com.sample.style.WtSections diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt index ad4f212d7f..b47e7a665b 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/AboutComposeWebLibsSection.kt @@ -1,9 +1,9 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.css.px -import androidx.compose.web.css.value -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.css.px +import org.jetbrains.compose.web.css.value +import org.jetbrains.compose.web.dom.* import com.sample.components.Card import com.sample.components.ContainerInSection import com.sample.components.LinkOnCard diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt index 5f1385f94d..670aaed1d2 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSamplesSwitcher.kt @@ -1,17 +1,17 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.InputType -import androidx.compose.web.attributes.checked -import androidx.compose.web.attributes.name -import androidx.compose.web.css.* -import androidx.compose.web.css.selectors.CSSSelector -import androidx.compose.web.css.selectors.descendant -import androidx.compose.web.css.selectors.selector -import androidx.compose.web.elements.Form -import androidx.compose.web.elements.Input -import androidx.compose.web.elements.Label -import androidx.compose.web.elements.Text +import org.jetbrains.compose.web.attributes.InputType +import org.jetbrains.compose.web.attributes.checked +import org.jetbrains.compose.web.attributes.name +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.selectors.descendant +import org.jetbrains.compose.web.css.selectors.selector +import org.jetbrains.compose.web.dom.Form +import org.jetbrains.compose.web.dom.Input +import org.jetbrains.compose.web.dom.Label +import org.jetbrains.compose.web.dom.Text import com.sample.style.AppStylesheet private object SwitcherVariables : CSSVariables { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt index d9d3539448..47c0b4f335 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt @@ -4,8 +4,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.HighlightJs import com.sample.components.ContainerInSection import com.sample.style.* diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt index 68d1114c69..4a3764be64 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Footer.kt @@ -1,10 +1,10 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.ATarget -import androidx.compose.web.attributes.target -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.attributes.ATarget +import org.jetbrains.compose.web.attributes.target +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.style.* diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt index dafdb68118..b3db58c8f1 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/GetStartedSection.kt @@ -1,8 +1,8 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.components.CardDark import com.sample.components.ContainerInSection import com.sample.components.LinkOnCard diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt index d74e9acdf1..d4a7348792 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/Header.kt @@ -1,10 +1,10 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.ATarget -import androidx.compose.web.attributes.target -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.attributes.ATarget +import org.jetbrains.compose.web.attributes.target +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.style.* import kotlinx.browser.window diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt index 9a0c2006c4..7e625bcc47 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/IntroSection.kt @@ -1,12 +1,12 @@ package com.sample.content import androidx.compose.runtime.* -import androidx.compose.web.attributes.ATarget -import androidx.compose.web.attributes.AttrsBuilder -import androidx.compose.web.attributes.Tag -import androidx.compose.web.attributes.target -import androidx.compose.web.css.* -import androidx.compose.web.elements.* +import org.jetbrains.compose.web.attributes.ATarget +import org.jetbrains.compose.web.attributes.AttrsBuilder +import org.jetbrains.compose.web.attributes.Tag +import org.jetbrains.compose.web.attributes.target +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.dom.* import com.sample.components.ContainerInSection import com.sample.style.* import org.w3c.dom.HTMLElement @@ -224,8 +224,8 @@ private fun ComposeWebStatusMessage() { } @Composable -inline fun Hr( - crossinline attrs: (AttrsBuilder.() -> Unit) = {} +fun Hr( + attrs: (AttrsBuilder.() -> Unit) = {} ) { TagElement( tagName = "hr", diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt index 853604e369..2dc30b17d9 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/content/JoinUs.kt @@ -1,10 +1,10 @@ package com.sample.content import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.ATarget -import androidx.compose.web.attributes.target -import androidx.compose.web.elements.* -import androidx.compose.web.css.* +import org.jetbrains.compose.web.attributes.ATarget +import org.jetbrains.compose.web.attributes.target +import org.jetbrains.compose.web.dom.* +import org.jetbrains.compose.web.css.* import com.sample.components.ContainerInSection import com.sample.style.* diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt index 61f6ee7f67..4acc137b0d 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/Stylesheet.kt @@ -1,7 +1,7 @@ package com.sample.style -import androidx.compose.web.css.* -import androidx.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.css.selectors.CSSSelector object AppCSSVariables : CSSVariables { val wtColorGreyLight by variable() diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt index f452992f0e..d5d76c2d8e 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCard.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtCards : StyleSheet(AppStylesheet) { val wtCard by style { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt index 2f647bbe13..7d5fea4aae 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtCol.kt @@ -1,7 +1,7 @@ package com.sample.style -import androidx.compose.web.css.* -import androidx.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.css.selectors.CSSSelector fun GenericStyleSheetBuilder.mediaMaxWidth( value: CSSSizeValue, diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt index 78fe65469c..af8f954c9a 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtContainer.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtContainer : StyleSheet(AppStylesheet) { val wtContainer by style { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt index fddbc90606..8868c2099f 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtDisplay.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtDisplay : StyleSheet(AppStylesheet) { val wtDisplayNone by style { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt index 3749c4e86c..b877854eb3 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtOffest.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtOffsets : StyleSheet(AppStylesheet) { val wtTopOffset96 by style { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt index 736eabd3aa..1e15941225 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtRow.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtRows : StyleSheet(AppStylesheet) { diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt index b5535647fa..9f1e2c2913 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtSection.kt @@ -1,6 +1,6 @@ package com.sample.style -import androidx.compose.web.css.* +import org.jetbrains.compose.web.css.* object WtSections : StyleSheet(AppStylesheet) { @@ -11,7 +11,7 @@ object WtSections : StyleSheet(AppStylesheet) { property( propertyName = "padding-bottom", value = value( - "calc(4*${AppCSSVariables.wtOffsetTopUnit.value(24.px).asString()})" + "calc(4*${AppCSSVariables.wtOffsetTopUnit.value(24.px)})" ) ) backgroundColor("#fff") diff --git a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt index 4aca6eb5a1..8642d1ee9a 100644 --- a/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt +++ b/examples/web_landing/src/jsMain/kotlin/com/sample/style/WtText.kt @@ -1,7 +1,7 @@ package com.sample.style -import androidx.compose.web.css.* -import androidx.compose.web.css.selectors.hover +import org.jetbrains.compose.web.css.* +import org.jetbrains.compose.web.css.selectors.hover object WtTexts : StyleSheet(AppStylesheet) { diff --git a/templates/web-template/src/main/kotlin/Main.kt b/templates/web-template/src/main/kotlin/Main.kt index 3ac3204f24..e21755d84d 100644 --- a/templates/web-template/src/main/kotlin/Main.kt +++ b/templates/web-template/src/main/kotlin/Main.kt @@ -1,6 +1,6 @@ -import androidx.compose.web.elements.Div -import androidx.compose.web.elements.Text -import androidx.compose.web.renderComposable +import org.jetbrains.compose.web.dom.Div +import org.jetbrains.compose.web.dom.Text +import org.jetbrains.compose.web.renderComposable fun main() { renderComposable(rootElementId = "root") { diff --git a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt index 7a5159d975..444d705e91 100644 --- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt +++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSKT.kt @@ -4,7 +4,7 @@ */ @file:Suppress("UNUSED") -package androidx.compose.web.css +package org.jetbrains.compose.web.css abstract class CSSNumericValueKT : CSSNumericValue diff --git a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt index 3889aca9d7..26eda9ce59 100644 --- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt +++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSTypedOM.kt @@ -4,7 +4,7 @@ */ @file:Suppress("UNUSED") -package androidx.compose.web.css +package org.jetbrains.compose.web.css import kotlin.js.JsName diff --git a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt index 2610fb657e..9e16df278d 100644 --- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt +++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/CSSUnits.kt @@ -1,6 +1,6 @@ @file:Suppress("UNUSED") -package androidx.compose.web.css +package org.jetbrains.compose.web.css // fake interfaces to distinguish units expect interface CSSSizeValue : CSSUnitValue diff --git a/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt b/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt index dfc1daf8d2..7d2a90d811 100644 --- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt +++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/keywords.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package androidx.compose.web.css +package org.jetbrains.compose.web.css interface CSSAutoValue : CSSKeywordValue diff --git a/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt b/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt index d0e0b96acd..b36b871ea6 100644 --- a/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt +++ b/web/core/src/commonMain/kotlin/androidx/compose/web/css/typing.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package androidx.compose.web.css +package org.jetbrains.compose.web.css expect interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue { interface Size : CSSSizeOrAutoValue diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt index c9cabdbf52..3b89c58de6 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/DomApplier.kt @@ -1,11 +1,11 @@ -package androidx.compose.web +package org.jetbrains.compose.web import androidx.compose.runtime.AbstractApplier -import androidx.compose.web.attributes.WrappedEventListener -import androidx.compose.web.css.StyleHolder -import androidx.compose.web.css.attributeStyleMap -import androidx.compose.web.elements.setProperty -import androidx.compose.web.elements.setVariable +import org.jetbrains.compose.web.attributes.WrappedEventListener +import org.jetbrains.compose.web.css.StyleHolder +import org.jetbrains.compose.web.css.attributeStyleMap +import org.jetbrains.compose.web.dom.setProperty +import org.jetbrains.compose.web.dom.setVariable import kotlinx.browser.document import kotlinx.dom.clear import org.w3c.dom.Element diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt index 200ad62e6b..647db56fc5 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/GlobalSnapshotManager.kt @@ -1,8 +1,8 @@ -package androidx.compose.web +package org.jetbrains.compose.web import androidx.compose.runtime.snapshots.ObserverHandle import androidx.compose.runtime.snapshots.Snapshot -import androidx.compose.web.GlobalSnapshotManager.ensureStarted +import org.jetbrains.compose.web.GlobalSnapshotManager.ensureStarted import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.launch diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt index b399e95776..93b382e3b0 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/JsMicrotasksDispatcher.kt @@ -1,4 +1,4 @@ -package androidx.compose.web +package org.jetbrains.compose.web import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Runnable diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt index c014326b67..a8c0b1b729 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/RenderComposable.kt @@ -1,11 +1,11 @@ -package androidx.compose.web +package org.jetbrains.compose.web import androidx.compose.runtime.Composable import androidx.compose.runtime.Composition import androidx.compose.runtime.ControlledComposition import androidx.compose.runtime.DefaultMonotonicFrameClock import androidx.compose.runtime.Recomposer -import androidx.compose.web.elements.DOMScope +import org.jetbrains.compose.web.dom.DOMScope import kotlinx.browser.document import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt index 82e85811dd..d040500378 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/Attrs.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.attributes +package org.jetbrains.compose.web.attributes import org.w3c.dom.HTMLInputElement diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt index 9742a2f4b6..a649fabf50 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/AttrsBuilder.kt @@ -1,9 +1,9 @@ -package androidx.compose.web.attributes +package org.jetbrains.compose.web.attributes import androidx.compose.runtime.DisposableEffectResult import androidx.compose.runtime.DisposableEffectScope -import androidx.compose.web.css.StyleBuilder -import androidx.compose.web.css.StyleBuilderImpl +import org.jetbrains.compose.web.css.StyleBuilder +import org.jetbrains.compose.web.css.StyleBuilderImpl import org.w3c.dom.Element import org.w3c.dom.HTMLElement diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt index f0468b2807..edf8e00bc5 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/EventsListenerBuilder.kt @@ -1,18 +1,18 @@ -package androidx.compose.web.attributes - -import androidx.compose.web.events.WrappedCheckBoxInputEvent -import androidx.compose.web.events.WrappedClipboardEvent -import androidx.compose.web.events.WrappedDragEvent -import androidx.compose.web.events.WrappedEvent -import androidx.compose.web.events.WrappedFocusEvent -import androidx.compose.web.events.WrappedInputEvent -import androidx.compose.web.events.WrappedKeyboardEvent -import androidx.compose.web.events.WrappedMouseEvent -import androidx.compose.web.events.WrappedRadioInputEvent -import androidx.compose.web.events.WrappedTextInputEvent -import androidx.compose.web.events.WrappedTouchEvent -import androidx.compose.web.events.WrappedWheelEvent -import androidx.compose.web.events.GenericWrappedEvent +package org.jetbrains.compose.web.attributes + +import org.jetbrains.compose.web.events.WrappedCheckBoxInputEvent +import org.jetbrains.compose.web.events.WrappedClipboardEvent +import org.jetbrains.compose.web.events.WrappedDragEvent +import org.jetbrains.compose.web.events.WrappedEvent +import org.jetbrains.compose.web.events.WrappedFocusEvent +import org.jetbrains.compose.web.events.WrappedInputEvent +import org.jetbrains.compose.web.events.WrappedKeyboardEvent +import org.jetbrains.compose.web.events.WrappedMouseEvent +import org.jetbrains.compose.web.events.WrappedRadioInputEvent +import org.jetbrains.compose.web.events.WrappedTextInputEvent +import org.jetbrains.compose.web.events.WrappedTouchEvent +import org.jetbrains.compose.web.events.WrappedWheelEvent +import org.jetbrains.compose.web.events.GenericWrappedEvent open class EventsListenerBuilder { diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt index 80f6398620..13fe8fb78d 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/PredefinedAttrValues.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.attributes +package org.jetbrains.compose.web.attributes sealed class InputType(val typeStr: String) { object Button : InputType("button") diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt index 772ab8ab72..2fd626a7ba 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/attributes/WrappedEventListener.kt @@ -1,19 +1,19 @@ -package androidx.compose.web.attributes - -import androidx.compose.web.events.GenericWrappedEvent -import androidx.compose.web.events.WrappedCheckBoxInputEvent -import androidx.compose.web.events.WrappedClipboardEvent -import androidx.compose.web.events.WrappedDragEvent -import androidx.compose.web.events.WrappedEventImpl -import androidx.compose.web.events.WrappedFocusEvent -import androidx.compose.web.events.WrappedInputEvent -import androidx.compose.web.events.WrappedKeyboardEvent -import androidx.compose.web.events.WrappedMouseEvent -import androidx.compose.web.events.WrappedPointerEvent -import androidx.compose.web.events.WrappedRadioInputEvent -import androidx.compose.web.events.WrappedTextInputEvent -import androidx.compose.web.events.WrappedTouchEvent -import androidx.compose.web.events.WrappedWheelEvent +package org.jetbrains.compose.web.attributes + +import org.jetbrains.compose.web.events.GenericWrappedEvent +import org.jetbrains.compose.web.events.WrappedCheckBoxInputEvent +import org.jetbrains.compose.web.events.WrappedClipboardEvent +import org.jetbrains.compose.web.events.WrappedDragEvent +import org.jetbrains.compose.web.events.WrappedEventImpl +import org.jetbrains.compose.web.events.WrappedFocusEvent +import org.jetbrains.compose.web.events.WrappedInputEvent +import org.jetbrains.compose.web.events.WrappedKeyboardEvent +import org.jetbrains.compose.web.events.WrappedMouseEvent +import org.jetbrains.compose.web.events.WrappedPointerEvent +import org.jetbrains.compose.web.events.WrappedRadioInputEvent +import org.jetbrains.compose.web.events.WrappedTextInputEvent +import org.jetbrains.compose.web.events.WrappedTouchEvent +import org.jetbrains.compose.web.events.WrappedWheelEvent import org.w3c.dom.DragEvent import org.w3c.dom.TouchEvent import org.w3c.dom.clipboard.ClipboardEvent diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt index af032eb14f..70bbd8f1e5 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSS.kt @@ -4,7 +4,7 @@ */ @file:Suppress("UNUSED", "NOTHING_TO_INLINE") -package androidx.compose.web.css +package org.jetbrains.compose.web.css import org.w3c.dom.HTMLElement import org.w3c.dom.css.* diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt index be1e4e8301..ba5943fd41 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSBuilder.kt @@ -1,6 +1,6 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css -import androidx.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.selectors.CSSSelector interface CSSBuilder : CSSStyleRuleBuilder, GenericStyleSheetBuilder { val root: CSSSelector diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt index 4b7382a96c..c0ce145584 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSMediaRule.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css interface CSSMediaQuery { interface Invertible : CSSMediaQuery diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt index 4f07b5487d..0250146419 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSProperties.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css fun StyleBuilder.opacity(value: Number) { property("opacity", value(value)) diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt index 6aea4c7a0d..532655e3a7 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSRules.kt @@ -1,6 +1,6 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css -import androidx.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.selectors.CSSSelector interface CSSStyleRuleBuilder : StyleBuilder diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt index 19c345236c..609ac9ed8a 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/CSSUnits.kt @@ -1,6 +1,6 @@ @file:Suppress("UNUSED") -package androidx.compose.web.css +package org.jetbrains.compose.web.css // fake interfaces to distinguish units actual external interface CSSSizeValue : CSSUnitValue diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt index 9487766988..01c37f31ac 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/Color.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css abstract class Color : CustomStyleValue { override fun styleValue(): StylePropertyValue = StylePropertyValue(toString()) diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt index 82c88d8675..d6178924dd 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleBuilder.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css import kotlin.properties.ReadOnlyProperty diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt index c702b71c98..a6b7c64b0e 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheet.kt @@ -1,12 +1,12 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.setValue -import androidx.compose.web.css.selectors.CSSSelector -import androidx.compose.web.css.selectors.className -import androidx.compose.web.elements.Style +import org.jetbrains.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.selectors.className +import org.jetbrains.compose.web.dom.Style import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt index 840170ffc4..5c20d03bec 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/StyleSheetBuilder.kt @@ -1,6 +1,6 @@ -package androidx.compose.web.css +package org.jetbrains.compose.web.css -import androidx.compose.web.css.selectors.CSSSelector +import org.jetbrains.compose.web.css.selectors.CSSSelector interface CSSRulesHolder { val cssRules: CSSRuleDeclarationList diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt index 981e3e1e75..ee6868e786 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/keywords.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package androidx.compose.web.css +package org.jetbrains.compose.web.css actual inline val auto: CSSAutoValue get() = CSSKeywordValue("auto").unsafeCast() \ No newline at end of file diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt index f98cc4def0..851e4fda33 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/selectors/CSSSelectors.kt @@ -1,6 +1,6 @@ -package androidx.compose.web.css.selectors +package org.jetbrains.compose.web.css.selectors -import androidx.compose.web.css.LanguageCode +import org.jetbrains.compose.web.css.LanguageCode sealed class Nth { data class Functional(val a: Int? = null, val b: Int? = null) { diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt index 6370c5a47a..e1dcbaea81 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/css/typing.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. */ -package androidx.compose.web.css +package org.jetbrains.compose.web.css actual interface CSSSizeOrAutoValue : CSSStyleValue, StylePropertyValue { actual interface Size : CSSSizeOrAutoValue diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt index 1214dbc0de..105a5c37cc 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Base.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.elements +package org.jetbrains.compose.web.dom import androidx.compose.runtime.Applier import androidx.compose.runtime.Composable @@ -10,10 +10,10 @@ import androidx.compose.runtime.ExplicitGroupsComposable import androidx.compose.runtime.SkippableUpdater import androidx.compose.runtime.currentComposer import androidx.compose.runtime.remember -import androidx.compose.web.DomApplier -import androidx.compose.web.DomElementWrapper -import androidx.compose.web.attributes.AttrsBuilder -import androidx.compose.web.attributes.Tag +import org.jetbrains.compose.web.DomApplier +import org.jetbrains.compose.web.DomElementWrapper +import org.jetbrains.compose.web.attributes.AttrsBuilder +import org.jetbrains.compose.web.attributes.Tag import kotlinx.browser.document import org.w3c.dom.Element import org.w3c.dom.HTMLElement diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt index bca92bc67c..1343bc5342 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/ElementScope.kt @@ -1,4 +1,4 @@ -package androidx.compose.web.elements +package org.jetbrains.compose.web.dom import androidx.compose.runtime.Composable import androidx.compose.runtime.ComposeCompilerApi diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt index b115edcc45..cd7c1dcf42 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Elements.kt @@ -1,20 +1,20 @@ -package androidx.compose.web.elements +package org.jetbrains.compose.web.dom import androidx.compose.runtime.Composable import androidx.compose.runtime.ComposeNode -import androidx.compose.web.DomApplier -import androidx.compose.web.DomNodeWrapper -import androidx.compose.web.attributes.AttrsBuilder -import androidx.compose.web.attributes.InputType -import androidx.compose.web.attributes.Tag -import androidx.compose.web.attributes.action -import androidx.compose.web.attributes.alt -import androidx.compose.web.attributes.forId -import androidx.compose.web.attributes.href -import androidx.compose.web.attributes.label -import androidx.compose.web.attributes.src -import androidx.compose.web.attributes.type -import androidx.compose.web.attributes.value +import org.jetbrains.compose.web.DomApplier +import org.jetbrains.compose.web.DomNodeWrapper +import org.jetbrains.compose.web.attributes.AttrsBuilder +import org.jetbrains.compose.web.attributes.InputType +import org.jetbrains.compose.web.attributes.Tag +import org.jetbrains.compose.web.attributes.action +import org.jetbrains.compose.web.attributes.alt +import org.jetbrains.compose.web.attributes.forId +import org.jetbrains.compose.web.attributes.href +import org.jetbrains.compose.web.attributes.label +import org.jetbrains.compose.web.attributes.src +import org.jetbrains.compose.web.attributes.type +import org.jetbrains.compose.web.attributes.value import kotlinx.browser.document import org.w3c.dom.HTMLAnchorElement import org.w3c.dom.HTMLBRElement diff --git a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt index 418b90e250..0593fa412d 100644 --- a/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt +++ b/web/core/src/jsMain/kotlin/androidx/compose/web/elements/Style.kt @@ -1,9 +1,9 @@ -package androidx.compose.web.elements +package org.jetbrains.compose.web.dom import androidx.compose.runtime.Composable -import androidx.compose.web.attributes.AttrsBuilder -import androidx.compose.web.attributes.Tag -import androidx.compose.web.css.* +import org.jetbrains.compose.web.attributes.AttrsBuilder +import org.jetbrains.compose.web.attributes.Tag +import org.jetbrains.compose.web.css.* import org.w3c.dom.HTMLStyleElement import org.w3c.dom.css.CSSGroupingRule import org.w3c.dom.css.CSSRule @@ -30,7 +30,7 @@ inline fun Style( * Use this function to mount the