From f2027e60f418bb94f9d32c779d0474de4d87a5c9 Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Wed, 21 Apr 2021 17:43:10 -0400 Subject: [PATCH 1/2] fix(resize): columns reposition not coming back after grid setOptions - when using SF custom grid view with `changeColumnsArrangement()` and then calling SlickGrid `setOptions`, the columns positions were reverting back to their original positions because of the `setOptions` 3rd argument that calls internally `treeColumns.extractColumns()` which reverts column positions, there must be something wrong in that SlickGrid internal code but for now a quick fix is to set the `setOptions` 3rd argument to `true` and right after we need to call `reRenderColumns` so that all grid options (like `editable` toggling) are reflected correctly in the grid --- .../slickgrid-vanilla-bundle.zip | Bin 713045 -> 713068 bytes .../__tests__/slick-vanilla-grid.spec.ts | 5 +++-- .../components/slick-vanilla-grid-bundle.ts | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip index 6b476bb060a2de6d264567c7856fac0dc31dd30c..00c209d696500307c3fabe9cbb4023980c45023a 100644 GIT binary patch delta 17324 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 Date: Wed, 21 Apr 2021 17:44:00 -0400 Subject: [PATCH 2/2] fix(tests): try setting fixed TZ while running Jest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fd4b872c..df50acf4d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "lint": "eslint packages/** --ext .ts", "test": "npx jest --runInBand --coverage=true --config ./test/jest.config.js", "test:ci": "npx jest --runInBand --coverage=true --ci --config ./test/jest.config.js", - "test:watch": "npx jest --watch --config ./test/jest.config.js" + "test:watch": "cross-env TZ='America/New_York' jest --watch --config ./test/jest.config.js" }, "comments": { "create-new-version": "To create a new version with Lerna, run the following scripts (1) 'bundle', (2) 'new-version' and (3) 'publish' to finally push to NPM."