Skip to content

Commit

Permalink
updated dependencies, [email protected], releasing 2.19
Browse files Browse the repository at this point in the history
  • Loading branch information
@JustFly1984
JustFly1984 committed Jul 15, 2023
1 parent f16e0f2 commit 228b714
Show file tree
Hide file tree
Showing 11 changed files with 5,550 additions and 5,031 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
'react',
'jsx-a11y',
'react-perf',
'react-functional-set-state',
'jest',
'jest-dom',
'prettier',
Expand Down
141 changes: 73 additions & 68 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,109 +45,114 @@
]
},
"resolutions": {
"@types/react": "18.0.25",
"@types/react-dom": "18.0.8"
"@babel/core": "7.22.9",
"@types/jest": "29.5.3",
"@types/node": "20.4.2",
"@types/react": "18.2.15",
"@types/react-dom": "18.2.7",
"@typescript-eslint/eslint-plugin": "6.0.0",
"@typescript-eslint/parser": "6.0.0"
},
"devDependencies": {
"@babel/core": "7.20.2",
"@babel/core": "7.22.9",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-decorators": "7.20.2",
"@babel/plugin-proposal-export-default-from": "7.18.10",
"@babel/plugin-proposal-decorators": "7.22.7",
"@babel/plugin-proposal-export-default-from": "7.22.5",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
"@babel/plugin-proposal-object-rest-spread": "7.20.2",
"@babel/plugin-proposal-optional-chaining": "7.18.9",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-proposal-optional-chaining": "7.21.0",
"@babel/plugin-proposal-private-methods": "7.18.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-syntax-jsx": "7.18.6",
"@babel/plugin-syntax-typescript": "7.20.0",
"@babel/plugin-transform-arrow-functions": "7.18.6",
"@babel/plugin-transform-classes": "7.20.2",
"@babel/plugin-transform-destructuring": "7.20.2",
"@babel/plugin-transform-for-of": "7.18.8",
"@babel/plugin-transform-parameters": "7.20.1",
"@babel/plugin-transform-react-jsx": "7.19.0",
"@babel/plugin-transform-spread": "7.19.0",
"@babel/plugin-transform-typescript": "7.20.2",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"@babel/preset-typescript": "7.18.6",
"@babel/plugin-syntax-jsx": "7.22.5",
"@babel/plugin-syntax-typescript": "7.22.5",
"@babel/plugin-transform-arrow-functions": "7.22.5",
"@babel/plugin-transform-classes": "7.22.6",
"@babel/plugin-transform-destructuring": "7.22.5",
"@babel/plugin-transform-for-of": "7.22.5",
"@babel/plugin-transform-parameters": "7.22.5",
"@babel/plugin-transform-react-jsx": "7.22.5",
"@babel/plugin-transform-spread": "7.22.5",
"@babel/plugin-transform-typescript": "7.22.9",
"@babel/preset-env": "7.22.9",
"@babel/preset-react": "7.22.5",
"@babel/preset-typescript": "7.22.5",
"@googlemaps/react-wrapper": "1.1.35",
"@jest/types": "29.2.1",
"@jest/types": "29.6.1",
"@mdx-js/loader": "1.6.22",
"@storybook/addon-actions": "6.5.13",
"@storybook/addon-essentials": "6.5.13",
"@storybook/addon-links": "6.5.13",
"@storybook/builder-webpack5": "6.5.13",
"@storybook/addon-actions": "7.0.27",
"@storybook/addon-essentials": "7.0.27",
"@storybook/addon-links": "7.0.27",
"@storybook/builder-webpack5": "7.0.27",
"@storybook/manager-webpack5": "6.5.13",
"@storybook/react": "6.5.13",
"@svgr/webpack": "6.5.1",
"@types/google.maps": "3.50.5",
"@storybook/react": "7.0.27",
"@svgr/webpack": "8.0.1",
"@testing-library/dom": "9.3.1",
"@types/google.maps": "3.53.4",
"@types/invariant": "2.2.35",
"@types/jest": "29.2.2",
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@types/react-dom": "18.0.8",
"@types/jest": "29.5.3",
"@types/node": "20.4.2",
"@types/react": "18.2.15",
"@types/react-dom": "18.2.7",
"@types/supercluster": "7.1.0",
"@typescript-eslint/eslint-plugin": "5.42.0",
"@typescript-eslint/parser": "5.42.0",
"@typescript-eslint/eslint-plugin": "6.0.0",
"@typescript-eslint/parser": "6.0.0",
"@typescript/lib-dom": "npm:@types/web",
"acorn": "8.8.1",
"acorn": "8.10.0",
"acorn-jsx": "5.3.2",
"autoprefixer": "10.4.13",
"babel-loader": "9.1.0",
"autoprefixer": "10.4.14",
"babel-loader": "9.1.3",
"babel-plugin-macros": "3.1.0",
"babel-plugin-polyfill-corejs3": "0.6.0",
"babel-plugin-react-require": "3.1.3",
"css-module-builder": "2.0.0",
"eslint": "8.27.0",
"eslint-config-prettier": "8.5.0",
"eslint-config-standard": "17.0.0",
"eslint-import-resolver-typescript": "3.5.2",
"babel-plugin-polyfill-corejs3": "0.8.2",
"babel-plugin-react-require": "4.0.0",
"css-module-builder": "2.0.6",
"eslint": "8.45.0",
"eslint-config-prettier": "8.8.0",
"eslint-config-standard": "17.1.0",
"eslint-import-resolver-typescript": "3.5.5",
"eslint-import-resolver-webpack": "0.13.2",
"eslint-plugin-ascii": "1.0.0",
"eslint-plugin-babel": "5.3.1",
"eslint-plugin-compat": "4.0.2",
"eslint-plugin-compat": "4.1.4",
"eslint-plugin-css-modules": "2.11.0",
"eslint-plugin-filenames": "1.3.2",
"eslint-plugin-html": "7.1.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jest": "27.1.4",
"eslint-plugin-jest-dom": "4.0.2",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-jest": "27.2.3",
"eslint-plugin-jest-dom": "5.0.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-n": "15.5.0",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-n": "16.0.1",
"eslint-plugin-no-inferred-method-name": "2.0.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-optimize-regex": "1.2.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-promiseparams": "1.0.8",
"eslint-plugin-react": "7.31.10",
"eslint-plugin-react-functional-set-state": "1.2.1",
"eslint-plugin-react": "7.32.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-perf": "3.3.1",
"eslint-plugin-security-node": "1.1.1",
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
"fork-ts-checker-webpack-plugin": "7.2.13",
"husky": "8.0.1",
"jest": "29.2.2",
"jest-environment-jsdom": "29.2.2",
"jest-specific-snapshot": "5.0.0",
"lerna": "6.0.1",
"lint-staged": "13.0.3",
"postcss": "8.4.18",
"fork-ts-checker-webpack-plugin": "8.0.0",
"husky": "8.0.3",
"jest": "29.6.1",
"jest-environment-jsdom": "29.6.1",
"jest-specific-snapshot": "8.0.0",
"lerna": "7.1.3",
"lint-staged": "13.2.3",
"postcss": "8.4.26",
"postcss-flexbugs-fixes": "5.0.2",
"prettier": "2.7.1",
"prettier": "3.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"require-from-string": "2.0.2",
"sass-loader": "13.1.0",
"sass-loader": "13.3.2",
"source-map-explorer": "2.5.3",
"ts-jest": "29.0.3",
"tsconfig-paths-webpack-plugin": "4.0.0",
"typescript": "4.9.0-dev.20220823",
"url-loader": "^4.1.1",
"webpack": "5.74.0"
"ts-jest": "29.1.1",
"tsconfig-paths-webpack-plugin": "4.1.0",
"typescript": "5.1.6",
"url-loader": "4.1.1",
"webpack": "5.88.1"
},
"husky": {
"hooks": {
Expand Down
14 changes: 7 additions & 7 deletions packages/react-google-maps-api-marker-clusterer/src/Cluster.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* global google */
/* eslint-disable filenames/match-regex */
import { Clusterer } from './Clusterer'

import type { Clusterer } from './Clusterer'

import { ClusterIcon } from './ClusterIcon'

import { MarkerExtended } from './types'
import type { MarkerExtended } from './types'

export class Cluster {
markerClusterer: Clusterer
Expand Down Expand Up @@ -75,8 +75,8 @@ export class Cluster {

const markers = this.getMarkers()

for (let i = 0; i < markers.length; i++) {
const position = markers[i].getPosition()
for (const marker of markers) {
const position = marker.getPosition()

if (position) {
bounds.extend(position)
Expand Down Expand Up @@ -148,8 +148,8 @@ export class Cluster {
}
} else if (mCount === this.minClusterSize) {
// Hide the markers that were showing.
for (let i = 0; i < mCount; i++) {
this.markers[i].setMap(null)
for (const markerElement of this.markers) {
markerElement.setMap(null)
}
} else {
marker.setMap(null)
Expand Down
43 changes: 23 additions & 20 deletions packages/react-google-maps-api-marker-clusterer/src/ClusterIcon.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global google */
/* eslint-disable filenames/match-regex */
import { Cluster } from './Cluster'
import type { Cluster } from './Cluster'

import { ClusterIconStyle, ClusterIconInfo } from './types'
import type { ClusterIconStyle, ClusterIconInfo } from './types'

export class ClusterIcon {
cluster: Cluster
Expand All @@ -16,8 +16,8 @@ export class ClusterIcon {
url: string
height: number
width: number
anchorText: number[]
anchorIcon: number[]
anchorText: [number, number]
anchorIcon: [number, number]
textColor: string
textSize: number
textDecoration: string
Expand Down Expand Up @@ -274,8 +274,8 @@ export class ClusterIcon {
// NOTE: values must be specified in px units
const bp = this.backgroundPosition.split(' ')

const spriteH = parseInt(bp[0].replace(/^\s+|\s+$/g, ''), 10)
const spriteV = parseInt(bp[1].replace(/^\s+|\s+$/g, ''), 10)
const spriteH = parseInt(bp[0]?.replace(/^\s+|\s+$/g, '') || '0', 10)
const spriteV = parseInt(bp[1]?.replace(/^\s+|\s+$/g, '') || '0', 10)

const pos = this.getPosFromLatLng(this.center)

Expand Down Expand Up @@ -324,29 +324,32 @@ export class ClusterIcon {
const style =
styles[Math.min(styles.length - 1, Math.max(0, sums.index - 1))]

this.url = style.url
this.height = style.height
this.width = style.width
if (style) {
this.url = style.url
this.height = style.height
this.width = style.width

if (style.className)
this.className = `${this.clusterClassName} ${style.className}`
if (style.className) {
this.className = `${this.clusterClassName} ${style.className}`
}

this.anchorText = style.anchorText || [0, 0]
this.anchorIcon = style.anchorIcon || [this.height / 2, this.width / 2]
this.anchorText = style.anchorText || [0, 0]
this.anchorIcon = style.anchorIcon || [this.height / 2, this.width / 2]

this.textColor = style.textColor || 'black'
this.textColor = style.textColor || 'black'

this.textSize = style.textSize || 11
this.textSize = style.textSize || 11

this.textDecoration = style.textDecoration || 'none'
this.textDecoration = style.textDecoration || 'none'

this.fontWeight = style.fontWeight || 'bold'
this.fontWeight = style.fontWeight || 'bold'

this.fontStyle = style.fontStyle || 'normal'
this.fontStyle = style.fontStyle || 'normal'

this.fontFamily = style.fontFamily || 'Arial,sans-serif'
this.fontFamily = style.fontFamily || 'Arial,sans-serif'

this.backgroundPosition = style.backgroundPosition || '0 0'
this.backgroundPosition = style.backgroundPosition || '0 0'
}
}

setCenter(center: google.maps.LatLng) {
Expand Down
Loading

0 comments on commit 228b714

Please sign in to comment.