Merge branch 'main' of https://github.com/gwinnem/vue-responsive-grid-layout

Author: gwinnem

.prettierignore

@@ -23,4 +23,3 @@ docs/
 node_modules/
 public/assets/
 src/vite-env.d.ts
-tests/

package-lock.json

@@ -95,7 +95,7 @@
     "@interactjs/interactjs": "^1.10.17",
     "@interactjs/modifiers": "^1.10.17",
     "element-resize-detector": "^1.2.4",
-    "mitt": "^3.0.0"
+    "mitt": "^3.0.1"
   },
   "devDependencies": {
     "@babel/types": "^7.20.5",
@@ -105,29 +105,29 @@
     "@types/node": "^18.11.11",
     "@typescript-eslint/eslint-plugin": "^5.45.1",
     "@typescript-eslint/parser": "^5.45.1",
-    "@vitejs/plugin-vue": "^3.2.0",
-    "@vitest/coverage-c8": "^0.28.4",
+    "@vitejs/plugin-vue": "^5.2.3",
+    "@vitest/coverage-c8": "^0.28.5",
     "@vitest/coverage-v8": "^0.34.6",
-    "@vitest/ui": "^0.34.6",
+    "@vitest/ui": "^0.34.7",
     "@vue/compiler-sfc": "^3.2.47",
-    "@vue/theme": "^1.3.0",
+    "@vue/theme": "^2.3.0",
     "@vue/tsconfig": "^0.1.3",
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^8.29.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-quotes": "^0.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-vue": "^9.8.0",
+    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-vue": "^9.33.0",
     "husky": "^8.0.3",
     "jsdom": "^21.1.0",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.3.0",
     "path": "^0.12.7",
     "postcss": "^8.4.21",
     "postcss-html": "^1.5.0",
     "postcss-scss": "^4.0.6",
-    "prettier": "^2.8.3",
+    "prettier": "^3.5.3",
     "sass": "^1.58.3",
     "sass-loader": "^13.2.0",
     "scss": "^0.2.4",
@@ -138,12 +138,11 @@
     "stylelint-config-standard-scss": "^3.0.0",
     "stylelint-order": "^5.0.0",
     "ttypescript": "^1.5.15",
-    "typescript": "^4.9.3",
-    "unplugin-vue-markdown": "^0.24.3",
-    "vite": "^3.0.0",
+    "typescript": "^4.9.5",
+    "unplugin-vue-markdown": "^28.3.1",
+    "vite": "^6.3.2",
     "vite-plugin-dts": "^1.7.3",
-    "vite-plugin-vue-markdown": "^0.22.2",
-    "vitepress": "^1.0.0-alpha.45",
+    "vitepress": "^1.6.3",
     "vitest": "^0.34.6",
     "vue": "^3.2.0",
     "vue-eslint-parser": "^9.1.0",

package.json

@@ -241,8 +241,6 @@ import {getFirstCollision} from "../src/core/gridlayout/helpers/collissionHelper
 
 // Model for select dropdown.
 const updateSelected = (val: string[]): void => {
-  // debugger;
-  // console.error(val);
   if (val.length > 0 && val.includes('All')) {
     selected.value = ['All'];
   }
@@ -264,8 +262,8 @@ const isDraggable = ref(true);
 const isMirrored = ref(false);
 const isResizable = ref(true);
 const isResponsive = ref(true);
-const marginLeftRight = ref(10);
-const marginTopBottom = ref(10);
+const marginLeftRight = ref(0);
+const marginTopBottom = ref(0);
 const maxRows = ref(10);
 const preserveAspectRatio = ref(false);
 const preventCollision = ref(false);
@@ -298,14 +296,14 @@ const onMaxRowsChange = (): void => {
 };
 
 const onMarginTopBottomChange = (): void => {
-  if (marginTopBottom.value < 1) {
-    marginTopBottom.value = 1;
+  if (marginTopBottom.value < 0) {
+    marginTopBottom.value = 0;
   }
 };
 
 const onMarginLeftRightChange = (): void => {
-  if (marginLeftRight.value < 1) {
-    marginLeftRight.value = 1;
+  if (marginLeftRight.value < 0) {
+    marginLeftRight.value = 0;
   }
 };
 

sandbox/App.vue

@@ -164,12 +164,12 @@ export const testDataOne: TLayout = [
 
 export const testDataTwo: TLayout = [
   {
-    i: 1,
+    i: 'test',
     h: 2,
     w: 1,
     x: 2,
     y: 0,
-    isDraggable: false,
+    isDraggable: true,
     isResizable: true,
   },
 ]