resolve conflicts

mohdashraf010897 · mohdashraf010897 · commit 20514d44768d · 2023-07-31T10:30:30.000+05:30
diff --git a/packages/maps-native/example/yarn.lock b/packages/maps-native/example/yarn.lock
@@ -5487,14 +5487,14 @@ schema-utils@^1.0.0:
     ajv-keywords "^3.1.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.1.1:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
-  integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 send@0.17.1:
   version "0.17.1"
diff --git a/packages/native/example/yarn.lock b/packages/native/example/yarn.lock
@@ -5472,14 +5472,14 @@ schema-utils@^1.0.0:
     ajv-keywords "^3.1.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.1.1:
-  version "6.2.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
-  integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 send@0.17.1:
   version "0.17.1"
diff --git a/packages/playground b/packages/playground
@@ -1 +1 @@
-Subproject commit f97f53c62d92218f90c0ffa8895a381204d1c618
+Subproject commit 222e0874c2cc2f2d47b84967369252a79c60ed61
diff --git a/packages/vue-playground b/packages/vue-playground
@@ -1 +1 @@
-Subproject commit c9d83e58f9ca1efb0b082e470ecf956fb956ac32
+Subproject commit 9d36780dc30d00aa3902300231b94647fbcb5b82
diff --git a/packages/vue/demos/good-books/package.json b/packages/vue/demos/good-books/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/analytics-with-hook/package.json b/packages/vue/examples/analytics-with-hook/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/dynamic-range-slider/package.json b/packages/vue/examples/dynamic-range-slider/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/mongo-examples/multi-list/package.json b/packages/vue/examples/mongo-examples/multi-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/mongo-examples/range-input/package.json b/packages/vue/examples/mongo-examples/range-input/package.json
@@ -8,7 +8,7 @@
 		"lint": "vue-cli-service lint"
 	},
 	"dependencies": {
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"vue": "^2.7.7"
 	},
 	"devDependencies": {
diff --git a/packages/vue/examples/mongo-examples/search-box/package.json b/packages/vue/examples/mongo-examples/search-box/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/multi-Range/package.json b/packages/vue/examples/multi-Range/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/multi-dropdown-list/package.json b/packages/vue/examples/multi-dropdown-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/multi-list-nested/package.json b/packages/vue/examples/multi-list-nested/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/multi-list/package.json b/packages/vue/examples/multi-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/preferences/package.json b/packages/vue/examples/preferences/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"vuejs-paginate": "^2.1.0"
 	},
 	"devDependencies": {
diff --git a/packages/vue/examples/range-input/package.json b/packages/vue/examples/range-input/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/range-slider/package.json b/packages/vue/examples/range-slider/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/reactive-component-with-custom-query/package.json b/packages/vue/examples/reactive-component-with-custom-query/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/reactive-component/package.json b/packages/vue/examples/reactive-component/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/reactive-google-map-aggregations/package.json b/packages/vue/examples/reactive-google-map-aggregations/package.json
@@ -10,7 +10,7 @@
 	"dependencies": {
 		"core-js": "^3.6.5",
 		"vue": "^3.2.45",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@babel/plugin-proposal-optional-chaining": "^7.18.6",
diff --git a/packages/vue/examples/reactive-google-map-default-query/package.json b/packages/vue/examples/reactive-google-map-default-query/package.json
@@ -10,7 +10,7 @@
 	"dependencies": {
 		"core-js": "^3.6.5",
 		"vue": "^3.2.45",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@babel/plugin-proposal-optional-chaining": "^7.18.6",
diff --git a/packages/vue/examples/reactive-google-map-nuxt/package.json b/packages/vue/examples/reactive-google-map-nuxt/package.json
@@ -11,9 +11,9 @@
 		"generate": "nuxt generate"
 	},
 	"dependencies": {
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"cross-env": "^5.2.0",
-		"nuxt": "^3.0.0"
+		"nuxt": "^3.4.3"
 	},
 	"devDependencies": {
 		"@babel/plugin-syntax-dynamic-import": "^7.2.0",
diff --git a/packages/vue/examples/reactive-google-map/package.json b/packages/vue/examples/reactive-google-map/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.45",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@babel/plugin-proposal-optional-chaining": "^7.18.6",
diff --git a/packages/vue/examples/reactive-list-custom-pagination/package.json b/packages/vue/examples/reactive-list-custom-pagination/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"vuejs-paginate": "^2.1.0"
 	},
 	"devDependencies": {
diff --git a/packages/vue/examples/reactive-list/package.json b/packages/vue/examples/reactive-list/package.json
@@ -8,7 +8,7 @@
 		"lint": "vue-cli-service lint"
 	},
 	"dependencies": {
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"vue": "^3.2.5",
 		"vuejs-paginate": "^2.1.0"
 	},
diff --git a/packages/vue/examples/reactivelist-with-aggregation/package.json b/packages/vue/examples/reactivelist-with-aggregation/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/reactivelist-without-aggregation/package.json b/packages/vue/examples/reactivelist-without-aggregation/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/result-card/package.json b/packages/vue/examples/result-card/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/result-list/package.json b/packages/vue/examples/result-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/saved-search/package.json b/packages/vue/examples/saved-search/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/search-box-custom-suggestions/package.json b/packages/vue/examples/search-box-custom-suggestions/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/search-box/package.json b/packages/vue/examples/search-box/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/selected-filters-custom/package.json b/packages/vue/examples/selected-filters-custom/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/single-dropdown-list/package.json b/packages/vue/examples/single-dropdown-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/single-list/package.json b/packages/vue/examples/single-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/single-range/package.json b/packages/vue/examples/single-range/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/toggle-button/package.json b/packages/vue/examples/toggle-button/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/tree-list/package.json b/packages/vue/examples/tree-list/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^3.2.5",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.5.0",
diff --git a/packages/vue/examples/with-ssr/package.json b/packages/vue/examples/with-ssr/package.json
@@ -10,10 +10,10 @@
 		"postinstall": "nuxt prepare"
 	},
 	"devDependencies": {
-		"nuxt": "^3.1.0"
+		"nuxt": "^3.4.3"
 	},
 	"dependencies": {
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18",
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1",
 		"@nuxtjs/emotion": "^1.0.0"
 	}
 }
diff --git a/packages/vue/examples/with-tailwind-css/package.json b/packages/vue/examples/with-tailwind-css/package.json
@@ -9,7 +9,7 @@
 	},
 	"dependencies": {
 		"vue": "^2.6.11",
-		"@appbaseio/reactivesearch-vue": "3.0.0-rc.18"
+		"@appbaseio/reactivesearch-vue": "3.1.0-rc.1"
 	},
 	"devDependencies": {
 		"@vue/cli-plugin-babel": "~4.3.0",
diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@appbaseio/reactivesearch-vue",
-	"version": "3.0.0-rc.18",
+	"version": "3.1.0-rc.1",
 	"private": false,
 	"main": "dist/cjs/index.js",
 	"jsnext:main": "dist/es/index.js",
@@ -40,7 +40,7 @@
 		"@appbaseio/vue-emotion": "0.6.0-alpha.6",
 		"@emotion/css": "^11.10.5",
 		"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-		"appbase-js": "^5.2.0",
+		"appbase-js": "^5.3.3",
 		"compute-scroll-into-view": "^1.0.11",
 		"emotion": "11.0.0",
 		"hotkeys-js": "^3.8.7",
diff --git a/packages/vue/src/components/ReactiveBase/index.jsx b/packages/vue/src/components/ReactiveBase/index.jsx
diff --git a/packages/vue/src/components/URLParamsProvider.jsx b/packages/vue/src/components/URLParamsProvider.jsx
diff --git a/packages/web/package.json b/packages/web/package.json
diff --git a/packages/web/src/components/basic/ReactiveBase.js b/packages/web/src/components/basic/ReactiveBase.js
diff --git a/yarn.lock b/yarn.lock
