Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
plantain-00 committed Sep 15, 2018
1 parent 76e9e43 commit ff452bd
Show file tree
Hide file tree
Showing 8 changed files with 377 additions and 369 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@commitlint/cli": "7.1.2",
"@commitlint/config-conventional": "7.1.2",
"@types/jasmine": "2.8.8",
"@types/puppeteer": "1.6.3",
"@types/puppeteer": "1.6.4",
"autoprefixer": "9.1.5",
"clean-css-cli": "4.2.1",
"clean-scripts": "1.9.2",
Expand All @@ -42,8 +42,8 @@
"karma-chrome-launcher": "2.2.0",
"karma-firefox-launcher": "1.1.0",
"karma-jasmine": "1.1.2",
"karma-webpack": "3.0.4",
"lerna": "3.3.0",
"karma-webpack": "3.0.5",
"lerna": "3.3.2",
"less": "3.8.1",
"markdownlint-cli": "0.13.0",
"no-unused-export": "1.6.0",
Expand All @@ -60,10 +60,10 @@
"stylelint-config-standard": "18.2.0",
"tslint": "5.11.0",
"tslint-config-standard": "8.0.1",
"tslint-sonarts": "1.7.0",
"tslint-sonarts": "1.8.0",
"typescript": "2.9.2",
"watch-then-execute": "1.1.1",
"webpack": "4.17.2",
"webpack": "4.19.0",
"webpack-cli": "3.1.0"
},
"dependencies": {}
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/src/index.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class Select2 implements ControlValueAccessor {
@ViewChild('selection') selection!: ElementRef
@ViewChild('results') private results!: ElementRef
@ViewChild('searchInput') private searchInput!: ElementRef
private hoveringValue: common.Select2Value | null | undefined = null
private hoveringValue?: common.Select2Value | null = null
private innerSearchText = ''
private lastScrollTopIndex = 0
private isSearchboxHidden!: boolean
Expand Down
12 changes: 4 additions & 8 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,15 @@ export function getPreviousOption(filteredData: Select2Data, hoveringValue: Sele
if (options) {
for (let j = options.length - 1; j >= 0; j--) {
const option = options[j]
if (findIt) {
if (!option.disabled) {
return option.value
}
if (findIt && !option.disabled) {
return option.value
}
findIt = option.value === hoveringValue
}
} else {
const option = groupOrOption as Select2Option
if (findIt) {
if (!option.disabled) {
return option.value
}
if (findIt && !option.disabled) {
return option.value
}
findIt = option.value === hoveringValue
}
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
],
"dependencies": {
"@types/node": "*",
"react": "15",
"react-dom": "16",
"react": "16",
"react-dom": "15",
"select2-component": "^5.4.0"
},
"devDependencies": {
"@types/react": "16.4.13",
"@types/react": "16.4.14",
"@types/react-dom": "16.0.7"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class Select2 extends React.PureComponent<{
open?: () => void;
search?: (text: string) => void;
}, {}> {
private hoveringValue: common.Select2Value | null | undefined = null
private hoveringValue?: common.Select2Value | null = null
private option: common.Select2Option | common.Select2Option[] | null = null
private isOpen = false
private focusoutTimer?: NodeJS.Timer
Expand Down
51 changes: 21 additions & 30 deletions packages/react/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"@types/node" "*"
"@types/react" "*"

"@types/react@*", "@types/react@16.4.13":
version "16.4.13"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.13.tgz#1385f5dc3486aa493849a32ccce626a817543e28"
"@types/react@*", "@types/react@16.4.14":
version "16.4.14"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.14.tgz#47c604c8e46ed674bbdf4aabf82b34b9041c6a04"
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"
Expand All @@ -34,17 +34,9 @@ core-js@^1.0.0:
version "1.2.7"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"

create-react-class@^15.6.0:
version "15.6.3"
resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
dependencies:
fbjs "^0.8.9"
loose-envify "^1.3.1"
object-assign "^4.1.1"

csstype@^2.2.0:
version "2.5.6"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.6.tgz#2ae1db2319642d8b80a668d2d025c6196071e788"
version "2.5.7"
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.5.7.tgz#bf9235d5872141eccfb2d16d82993c6b149179ff"

encoding@^0.1.11:
version "0.1.12"
Expand Down Expand Up @@ -115,32 +107,31 @@ prop-types@^15.5.10, prop-types@^15.6.2:
loose-envify "^1.3.1"
object-assign "^4.1.1"

react-dom@16:
version "16.5.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.0.tgz#57704e5718669374b182a17ea79a6d24922cb27d"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
schedule "^0.3.0"

react@15:
react-dom@15:
version "15.6.2"
resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
dependencies:
create-react-class "^15.6.0"
fbjs "^0.8.9"
loose-envify "^1.1.0"
object-assign "^4.1.0"
prop-types "^15.5.10"

react@16:
version "16.5.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.5.1.tgz#8cb8e9f8cdcb4bde41c9a138bfbf907e66132372"
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.2"
schedule "^0.4.0"

"safer-buffer@>= 2.1.2 < 3":
version "2.1.2"
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"

schedule@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.3.0.tgz#1be2ab2fc2e768536269ce7326efb478d6c045e8"
schedule@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/schedule/-/schedule-0.4.0.tgz#fa20cfd0bfbf91c47d02272fd7096780d3170bbb"
dependencies:
object-assign "^4.1.1"

Expand All @@ -153,5 +144,5 @@ ua-parser-js@^0.7.18:
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"

whatwg-fetch@>=0.10.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
version "3.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
2 changes: 1 addition & 1 deletion packages/vue/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class Select2 extends Vue {

option: common.Select2Option | common.Select2Option[] | null = null
searchStyle!: string
private hoveringValue: common.Select2Value | null | undefined = null
private hoveringValue?: common.Select2Value | null = null
private isOpen = false
private focusoutTimer?: NodeJS.Timer
private innerSearchText = ''
Expand Down

0 comments on commit ff452bd

Please sign in to comment.