Add some new fixes

DevExpress · Nov 15, 2023 · 093cc21 · 093cc21
1 parent 9d9a5e1
commit 093cc21
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 19 deletions.
diff --git a/devextreme-23.2.0.tgz b/devextreme-23.2.0.tgz
diff --git a/devextreme-angular-23.2.0.tgz b/devextreme-angular-23.2.0.tgz
diff --git a/devextreme-themebuilder-23.2.0.tgz b/devextreme-themebuilder-23.2.0.tgz
diff --git a/src/app/preview/editors/editors.component.css b/src/app/preview/editors/editors.component.css
@@ -14,6 +14,11 @@
     margin-right: 10px;
 }
 
+.collapsed-block {
+    display: flex;
+    align-items: center;
+}
+
 .editors {
     margin-bottom: 30px;
     flex-direction: column;
@@ -107,7 +112,7 @@
 }
 
 .switchers {
-    gap: 24px;
+    gap: 48px;
 }
 
 .component-container {
@@ -117,7 +122,7 @@
 }
 
 .fileuploader {
-    width: 250px;
+    width: 360px;
 }
 
 .component-section {
@@ -129,3 +134,16 @@
     flex: 1;
     display: flex;
 }
+
+.last-fields {
+    display: flex;
+    width: 100%;
+}
+
+.editors .last-fields .field.validation {
+    flex-basis: 32%;
+}
+
+.editors .last-fields .field.daterangebox {
+    flex-basis: 66%;
+}
diff --git a/src/app/preview/editors/editors.component.html b/src/app/preview/editors/editors.component.html
@@ -1,12 +1,14 @@
 <div *ngIf="isExpanded.getValue(); then expandedBlock; else collapsedBlock"></div>
 
 <ng-template #collapsedBlock>
-    <dx-text-box width="140" value="Text Box"></dx-text-box>
-    <dx-tag-box width="140" [multiline]="false" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']" [value]="['Monday']"></dx-tag-box>
-    <dx-select-box width="140" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"></dx-select-box>
-    <dx-lookup width="140" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"></dx-lookup>
-    <dx-check-box [value]="true"></dx-check-box>
-    <dx-radio-group [items]="['']" value=""></dx-radio-group>
+    <div class="collapsed-block">
+        <dx-text-box width="130" value="Text Box"></dx-text-box>
+        <dx-tag-box width="130" [multiline]="false" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']" [value]="['Monday']"></dx-tag-box>
+        <dx-select-box width="130" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"></dx-select-box>
+        <dx-lookup width="130" [items]="['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']"></dx-lookup>
+        <dx-check-box [value]="true"></dx-check-box>
+        <dx-radio-group [items]="['']" value=""></dx-radio-group>
+    </div>
 </ng-template>
 
 <ng-template #expandedBlock>
@@ -40,15 +42,17 @@
                 <div class="field">
                     <dx-lookup [stylingMode]="stylingModeValue" [items]="['Outlined', 'Filled', 'Underlined']" value="Outlined" label="Lookup"></dx-lookup>
                 </div>
-                <div class="field">
-                    <dx-text-box [stylingMode]="stylingModeValue" [value]="invalidValue" label="Validated">
-                        <dx-validator>
-                            <dxi-validation-rule type="stringLength" [min]="1"  message="Field is required"></dxi-validation-rule>
-                        </dx-validator>
-                    </dx-text-box>
-                </div>
-                <div class="field daterangebox">
-                    <dx-date-range-box [stylingMode]="stylingModeValue" [dropDownOptions]="dropDownOptions"></dx-date-range-box>
+                <div class="last-fields">
+                    <div class="field validation">
+                        <dx-text-box [stylingMode]="stylingModeValue" [value]="invalidValue" label="Validated">
+                            <dx-validator>
+                                <dxi-validation-rule type="stringLength" [min]="1"  message="Field is required"></dxi-validation-rule>
+                            </dx-validator>
+                        </dx-text-box>
+                    </div>
+                    <div class="field daterangebox">
+                        <dx-date-range-box [stylingMode]="stylingModeValue" [dropDownOptions]="dropDownOptions"></dx-date-range-box>
+                    </div>
                 </div>
             </div>
         </div>

diff --git a/src/app/preview/overlays/overlays.component.html b/src/app/preview/overlays/overlays.component.html
@@ -73,7 +73,7 @@
     </dx-load-panel>
     <dx-action-sheet #actionSheet [dataSource]="actionSheetData" [visible]="false"></dx-action-sheet>
     <dx-tooltip #tooltip  target="#tooltip-button" position="top" [visible]="false"> 
-        <p>Tooltip content</p>
+        <div>Tooltip content</div>
     </dx-tooltip>
     <dx-toast 
         message="Info toast" 

diff --git a/src/app/preview/scrollview/scrollview.component.html b/src/app/preview/scrollview/scrollview.component.html
@@ -1,4 +1,10 @@
-<dx-scroll-view class="detailed-scrollview" #scrollView [bounceEnabled]="true" direction="both">
+<dx-scroll-view
+    class="detailed-scrollview"
+    #scrollView
+    [bounceEnabled]="true"
+    direction="both"
+    height="320px"
+>
     <div id="content">
         <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
             Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.