fix getting border

DevExpress · Sep 23, 2024 · 50a5380 · 50a5380
1 parent 66c821b
commit 50a5380
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts
@@ -8,7 +8,7 @@ import { Deferred, when } from '@js/core/utils/deferred';
 import { extend } from '@js/core/utils/extend';
 import { each } from '@js/core/utils/iterator';
 import { getBoundingRect } from '@js/core/utils/position';
-import { getHeight } from '@js/core/utils/size';
+import { getHeight, getInnerWidth, getOuterWidth } from '@js/core/utils/size';
 import { format } from '@js/core/utils/string';
 import { isDefined, isFunction, isString } from '@js/core/utils/type';
 import variableWrapper from '@js/core/utils/variable_wrapper';
@@ -743,4 +743,12 @@ export default {
 
     logSpecificDeprecatedWarningIfNeed(columns);
   },
+
+  getComponentBorderWidth(that, $rowsViewElement) {
+    const borderWidth = that.option('showBorders')
+      ? Math.ceil(getOuterWidth($rowsViewElement) - getInnerWidth($rowsViewElement))
+      : 0;
+
+    return borderWidth;
+  },
 };
diff --git a/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts b/packages/devextreme/js/__internal/grids/grid_core/sticky_columns/m_sticky_columns.ts
@@ -4,6 +4,7 @@ import $ from '@js/core/renderer';
 
 import type { ColumnHeadersView } from '../column_headers/m_column_headers';
 import type { ModuleType } from '../m_types';
+import gridCoreUtils from '../m_utils';
 import type { ColumnsView } from '../views/m_columns_view';
 import type { RowsView } from '../views/m_rows_view';
 import { isGroupRow } from '../views/m_rows_view';
@@ -277,7 +278,7 @@ const rowsView = (
       $detailCell
         .addClass(this.addWidgetPrefix(CLASSES.stickyColumnLeft))
         // @ts-expect-error
-        .width(componentWidth - 2);
+        .width(componentWidth - gridCoreUtils.getComponentBorderWidth(this, this._$element));
     }
 
     return $detailCell;

diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts
@@ -8,10 +8,7 @@ import type { DeferredObj } from '@js/core/utils/deferred';
 import { Deferred, when } from '@js/core/utils/deferred';
 import { each } from '@js/core/utils/iterator';
 import { getBoundingRect } from '@js/core/utils/position';
-import {
-  getHeight,
-  getInnerWidth, getOuterWidth, getWidth,
-} from '@js/core/utils/size';
+import { getHeight, getWidth } from '@js/core/utils/size';
 import { isDefined, isNumeric, isString } from '@js/core/utils/type';
 import { getWindow, hasWindow } from '@js/core/utils/window';
 import messageLocalization from '@js/localization/message';
@@ -508,9 +505,7 @@ export class ResizingController extends modules.ViewController {
           resultWidths[lastColumnIndex] = 'auto';
           isColumnWidthsCorrected = true;
           if (hasWidth === false && !hasPercentWidth) {
-            const borderWidth = that.option('showBorders')
-              ? Math.ceil(getOuterWidth($rowsViewElement) - getInnerWidth($rowsViewElement))
-              : 0;
+            const borderWidth = gridCoreUtils.getComponentBorderWidth(this, $rowsViewElement);
 
             that._maxWidth = totalWidth + scrollbarWidth + borderWidth;
             // @ts-expect-error