Merge branch '25_1' into 25_1_ng_leak_click

Author: GoodDayForSurf

e2e/testcafe-devextreme/tests/navigation/drawer/common.ts

@@ -1,54 +1,78 @@
-export function createDrawer({
-  openedStateMode, shading, createOuterContent, createDrawerContent, createInnerContent,
-}: { [key: string]: any }): void {
-  function createDrawerInt($container: any): void {
+import { ClientFunction } from 'testcafe';
+import { Properties } from 'devextreme/ui/drawer';
+
+interface CreateDrawerConfig {
+  options?: Properties;
+  createDrawerContent?: ($drawerContent: JQuery) => void;
+  createOuterContent?: ($container: JQuery) => void;
+  testInPopup?: boolean;
+}
+
+export const createDrawer = ClientFunction(({
+  options = {},
+  createDrawerContent,
+  createOuterContent,
+  testInPopup = false,
+}: CreateDrawerConfig) => {
+  const createDrawerInt = ($container: JQuery) => {
     if (createOuterContent) {
       createOuterContent($container);
     }
 
-    const $drawer = $('<div id=\'drawer1\'>');
-    const $templateView = $('<div style=\'background-color: aquamarine; height: 100%;\'>').appendTo($drawer);
-    if (openedStateMode === 'overlap') {
-      $templateView.css('padding-left', '200px');
-    }
-    if (openedStateMode === 'push') {
-      $templateView.css('padding-right', '200px');
-    }
+    const $drawer = $('<div id="drawer">');
+    const $templateView = $('<div style="background-color: aquamarine; height: 100%;">').appendTo($drawer);
 
-    if (createInnerContent) {
-      createInnerContent($templateView);
-    }
+    $('<div id="inner">')
+      .text('Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Penatibus et magnis dis parturient. Eget dolor morbi non arcu risus. Tristique magna sit amet purus gravida quis blandit. Auctor urna nunc id cursus metus aliquam eleifend mi in.')
+      .appendTo($templateView);
 
     ($drawer.appendTo($container) as any).dxDrawer({
-      openedStateMode,
-      shading,
       opened: true,
+      shading: true,
       height: 400,
       template: () => {
-        const $result = $('<div>').width('200px').css('background-color', 'aqua').css('height', '100%');
+        const isTopOrBottom = options.position === 'top' || options.position === 'bottom';
+        const cssSizeProperty = isTopOrBottom ? 'width' : 'height';
+
+        const $result = $('<div>')
+          .css('background-color', 'aqua')
+          .css(cssSizeProperty, '100%');
+
+        if (isTopOrBottom) {
+          $result.height('100px');
+        } else {
+          $result.width('200px');
+        }
+
         if (createDrawerContent) {
           createDrawerContent($result);
+        } else {
+          $('<div>').text('Drawer Content').appendTo($result);
         }
+
         return $result;
       },
+      ...options,
     });
-  }
+  };
 
-  ($('<div id="showPopupBtn">').appendTo($('#container')) as any)
-    .dxButton({
+  if (testInPopup) {
+    ($('<div id="showPopupBtn">').appendTo($('#container')) as any).dxButton({
       text: 'Show Popup',
       onClick: () => ($('#popup1') as any).dxPopup('instance').show(),
     });
-  ($('<div id=\'popup1\'>').appendTo($('#container')) as any).dxPopup({
-    position: 'top',
-    height: 600,
-    showTitle: false,
-    contentTemplate: () => {
-      const $popupTemplate = $('<div id="popup1_template">').css('background-color', 'blanchedalmond').css('height', '100%');
-      createDrawerInt($popupTemplate);
-      return $popupTemplate;
-    },
-  });
+
+    ($('<div id="popup1">').appendTo($('#container')) as any).dxPopup({
+      position: 'top',
+      height: 600,
+      showTitle: false,
+      contentTemplate: () => {
+        const $popupTemplate = $('<div id="popup1_template">').css('background-color', 'blanchedalmond').css('height', '100%');
+        createDrawerInt($popupTemplate);
+        return $popupTemplate;
+      },
+    });
+  }
 
   createDrawerInt($('#container'));
-}
+});