Merge pull request #51 from adjust/fixes

Bug fixes
adjust · Dec 12, 2023 · 91ba52d · 91ba52d
2 parents 7840b4a + cc759c9
commit 91ba52d
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 4 deletions.
diff --git a/layout/assets/reset-styles.scss b/layout/assets/reset-styles.scss
@@ -0,0 +1,12 @@
+@import 'assets/fonts.scss';
+
+@mixin reset-styles($backgroundColor: transparent) {
+  min-width: auto;
+  min-height: auto;
+  padding: 0;
+  margin: 0;
+  background-color: $backgroundColor;
+  font-family: $fontsFamily;
+  font-size: 16px;
+  line-height: normal;
+}
diff --git a/layout/src/action-button/styles.module.scss b/layout/src/action-button/styles.module.scss
@@ -1,7 +1,11 @@
 @import 'assets/colors.scss';
 @import 'assets/fonts.scss';
 
+@import 'assets/reset-styles.scss';
+
 .action {
+  @include reset-styles;
+
   color: $ctaColor;
   background: $ctaBackgroundColor;
   border: 1px solid rgba(205, 208, 224, 0.3);

diff --git a/layout/src/app-icon/styles.module.scss b/layout/src/app-icon/styles.module.scss
@@ -4,8 +4,11 @@
 
 @import 'assets/colors.scss';
 @import 'assets/fonts.scss';
+@import 'assets/reset-styles.scss';
 
 .app-icon {
+  @include reset-styles;
+
   min-width: 56px;
   width: 56px;
   height: 56px;

diff --git a/layout/src/banner-body/styles.module.scss b/layout/src/banner-body/styles.module.scss
@@ -4,8 +4,11 @@
 
 @import 'assets/colors.scss';
 @import 'assets/fonts.scss';
+@import 'assets/reset-styles.scss';
 
 .banner-body {
+  @include reset-styles;
+
   display: flex;
   box-sizing: border-box;
   height: 100%;
@@ -40,6 +43,8 @@
   }
 
   .container {
+    @include reset-styles;
+
     display: flex;
     flex: 1;
     height: 100%;
@@ -69,6 +74,8 @@
     }
 
     .text-container {
+      @include reset-styles;
+
       flex: 0 1 auto;
       min-height: 0;
       min-width: 0;

diff --git a/layout/src/dismiss-button/styles.module.scss b/layout/src/dismiss-button/styles.module.scss
@@ -3,8 +3,11 @@
 @use 'assets/size-large.scss' as large;
 
 @import 'assets/colors.scss';
+@import 'assets/reset-styles.scss';
 
 .dismiss {
+  @include reset-styles;
+
   flex-shrink: 0;
   padding: 0;
   border: none;

diff --git a/layout/src/smart-banner-view.ts b/layout/src/smart-banner-view.ts
@@ -42,7 +42,7 @@ export class SmartBannerView implements SmartBannerLayout {
   }
 
   private attachBannerToParent(parent: HTMLElement) {
-    const attach = (child: HTMLElement, parent: HTMLElement, position?: Position) => {
+    const attach = (child: HTMLElement, parent: HTMLElement, position: Position) => {
       if (position === Position.Top) {
         parent.insertBefore(child, parent.firstChild);
       } else {
@@ -55,10 +55,10 @@ export class SmartBannerView implements SmartBannerLayout {
     }
 
     if (this.wrapper) {
-      attach(this.root, this.wrapper);
-      attach(this.wrapper, parent);
+      attach(this.root, this.wrapper, this.data.position);
+      attach(this.wrapper, parent, this.data.position);
     } else {
-      attach(this.root, parent);
+      attach(this.root, parent, this.data.position);
     }
   }
 

diff --git a/layout/src/styles.module.scss b/layout/src/styles.module.scss
@@ -2,6 +2,8 @@
 @use 'assets/size-medium.scss' as medium;
 @use 'assets/size-large.scss' as large;
 
+@import 'assets/reset-styles.scss';
+
 .banner-placeholder {
   height: small.$bannerHeight;
 }
@@ -12,6 +14,8 @@
 }
 
 .banner {
+  @include reset-styles;
+
   pointer-events: none;
   position: fixed;
   left: 0;

diff --git a/layout/src/text/styles.module.scss b/layout/src/text/styles.module.scss
@@ -4,8 +4,11 @@
 
 @import 'assets/colors.scss';
 @import 'assets/fonts.scss';
+@import 'assets/reset-styles.scss';
 
 .banner-text {
+  @include reset-styles;
+
   overflow: hidden;
 }