@odx/ui 3.8.0 → 3.9.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @odx/ui
 
+## 3.9.0
+
+### Minor Changes
+
+- 32bc292: Added possibility for datepicker and daterangepicker to be included in main filter group
+
 ## 3.8.0
 
 ### Minor Changes

package/core-theme.css

@@ -4856,9 +4856,13 @@ html body .odx-fs-italic {
   min-width: calc(var(--odx-vertical-rythm-base-size) * 7.1667);
 }
 .odx-mainfilter-group .odx-form-field__label {
+  padding-right: calc(var(--odx-vertical-rythm-base-size) * 0.125);
+  padding-left: calc(var(--odx-vertical-rythm-base-size) * 0.125);
+  background-color: var(--odx-input-control-background-color);
   margin-top: 0;
   position: absolute;
   right: 0;
+  right: calc(var(--odx-vertical-rythm-base-size) * 0.3334);
   top: calc(var(--odx-vertical-rythm-base-size) * 0.5);
   z-index: 1;
 }
@@ -4866,11 +4870,8 @@ html body .odx-fs-italic {
   right: calc(var(--odx-vertical-rythm-base-size) * 1.5);
 }
 .odx-mainfilter-group .odx-form-field-label {
-  padding-right: calc(var(--odx-vertical-rythm-base-size) * 0.125);
-  padding-left: calc(var(--odx-vertical-rythm-base-size) * 0.125);
   padding-top: calc(var(--odx-vertical-rythm-base-size) * 0.0834);
   padding-bottom: calc(var(--odx-vertical-rythm-base-size) * 0.0834);
-  background-color: var(--odx-input-control-background-color);
   border-radius: var(--odx-v-border-radius-controls);
   display: inline-block;
   font-size: calc(var(--odx-vertical-rythm-base-size) * 0.4167);
@@ -4938,6 +4939,25 @@ html body .odx-fs-italic {
   background-color: transparent;
 }
 }
+.odx-mainfilter-group .odx-datepicker > .odx-action-group,
+.odx-mainfilter-group .odx-daterangepicker > .odx-action-group {
+  z-index: 1;
+}
+.odx-mainfilter-group .odx-datepicker .odx-button,
+.odx-mainfilter-group .odx-daterangepicker .odx-button {
+  margin-top: 0;
+  outline: none;
+}
+.odx-mainfilter-group .odx-datepicker .odx-button::before,
+.odx-mainfilter-group .odx-daterangepicker .odx-button::before {
+  content: unset;
+}
+.odx-mainfilter-group .odx-daterangepicker__trigger-wrapper .odx-button {
+  margin-left: calc(var(--odx-vertical-rythm-base-size) * 0.5);
+}
+.odx-mainfilter-group .odx-calendar {
+  --odx-input-control-outline-color: var(--gray-200);
+}
 
 .odx-main-menu-button {
   color: inherit;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odx/ui",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "author": "Drägerwerk AG & Co.KGaA",
   "license": "SEE LICENSE IN LICENSE",
   "peerDependencies": {

package/scss/components/mainfilter-group.component.scss

@@ -42,9 +42,13 @@
     }
 
     &__label {
+      @include dimensions.padding-x(math.div(3, 24));
+
+      background-color: var(--odx-input-control-background-color);
       margin-top: 0;
       position: absolute;
       right: 0;
+      right: dimensions.get-size(math.div(8, 24));
       top: dimensions.get-size(math.div(12, 24));
       z-index: 1;
     }
@@ -56,10 +60,8 @@
     }
 
     &-label {
-      @include dimensions.padding-x(math.div(3, 24));
       @include dimensions.padding-y(math.div(2, 24));
 
-      background-color: var(--odx-input-control-background-color);
       border-radius: var(--odx-v-border-radius-controls);
       display: inline-block;
       font-size: dimensions.get-size(math.div(10, 24));
@@ -136,4 +138,30 @@
       }
     }
   }
+
+  .odx-datepicker,
+  .odx-daterangepicker {
+    & > .odx-action-group {
+      z-index: 1;
+    }
+
+    .odx-button {
+      margin-top: 0;
+      outline: none;
+
+      &::before {
+        content: unset;
+      }
+    }
+  }
+
+  .odx-daterangepicker {
+    &__trigger-wrapper .odx-button {
+      @include dimensions.margin(0.5, left);
+    }
+  }
+
+  .odx-calendar {
+    --odx-input-control-outline-color: var(--gray-200);
+  }
 }