From 44883e4817b50959c85b8bdb7a46581c3f3a9b28 Mon Sep 17 00:00:00 2001 From: zhuokuang <2183692898@qq.com> Date: Mon, 7 Nov 2022 21:07:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(List):=20List=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E8=BF=9B=E5=8E=BB=E4=B8=8D=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/quark/src/list/index.tsx | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/quark/src/list/index.tsx b/packages/quark/src/list/index.tsx index 025c9f6b..132aeb7a 100644 --- a/packages/quark/src/list/index.tsx +++ b/packages/quark/src/list/index.tsx @@ -47,15 +47,22 @@ class QuarkList extends QuarkElement { }) loading: boolean = false; + @property({ + type: Boolean + }) + immediateCheck: boolean = true; + placeholderRef: any = createRef(); componentDidMount() { - this.check({ auto: true }); - window.addEventListener('scroll', this.check); + if(this.immediateCheck) { + setTimeout(() => this.check({ auto: true }), 50); + } + window.addEventListener('scroll', this.check, true); } componentWillUnmount() { - window.removeEventListener('scroll', this.check); + window.removeEventListener('scroll', this.check, true); } shouldComponentUpdate( From 9c626f435929db0da24e7c07da244d5c34a8f916 Mon Sep 17 00:00:00 2001 From: Sanqi <861127175@qq.com> Date: Tue, 8 Nov 2022 15:02:35 +0800 Subject: [PATCH 2/4] feat: rimraf --- packages/quark-core/package.json | 5 +++-- packages/quark-icons/package.json | 5 +++-- packages/quark-react/package.json | 5 +++-- packages/quark-reactify/package.json | 5 +++-- packages/quark/package.json | 7 ++++--- yarn.lock | 2 +- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/quark-core/package.json b/packages/quark-core/package.json index b927d57d..dd861105 100644 --- a/packages/quark-core/package.json +++ b/packages/quark-core/package.json @@ -10,7 +10,7 @@ "package.json" ], "scripts": { - "build": "rm -rf lib && cross-env BABEL_ENV=umd rollup -c", + "build": "rimraf lib && cross-env BABEL_ENV=umd rollup -c", "release:major": "npm run release -- --release-as major", "release:minor": "npm run release -- --release-as minor", "release:patch": "npm run release -- --release-as patch", @@ -36,7 +36,8 @@ "rollup-plugin-terser": "^7.0.2", "sinon": "^12.0.1", "standard-version": "^9.3.0", - "typescript": "^4.1.5" + "typescript": "^4.1.5", + "rimraf": "3.0.2" }, "repository": { "type": "git", diff --git a/packages/quark-icons/package.json b/packages/quark-icons/package.json index cb36f94b..a804d40a 100644 --- a/packages/quark-icons/package.json +++ b/packages/quark-icons/package.json @@ -11,7 +11,7 @@ "package.json" ], "scripts": { - "build": "rm -rf umd && rm -rf lib && cross-env BABEL_ENV=umd rollup -c", + "build": "rimraf umd && rimraf lib && cross-env BABEL_ENV=umd rollup -c", "release:major": "npm run release -- --release-as major", "release:minor": "npm run release -- --release-as minor", "release:patch": "npm run release -- --release-as patch", @@ -59,7 +59,8 @@ "stylelint-scss": "^4.2.0", "typescript": "^4.1.5", "vite": "^2.3.4", - "standard-version": "^9.3.0" + "standard-version": "^9.3.0", + "rimraf": "3.0.2" }, "engines": { "node": ">=12.0.0" diff --git a/packages/quark-react/package.json b/packages/quark-react/package.json index 774cf030..10969508 100644 --- a/packages/quark-react/package.json +++ b/packages/quark-react/package.json @@ -13,7 +13,7 @@ "package.json" ], "scripts": { - "build": "rm -rf lib && npx tsc", + "build": "rimraf lib && npx tsc", "release:major": "npm run release -- --release-as major", "release:minor": "npm run release -- --release-as minor", "release:patch": "npm run release -- --release-as patch", @@ -55,7 +55,8 @@ "rollup-plugin-terser": "^7.0.2", "sinon": "^12.0.1", "standard-version": "^9.3.0", - "typescript": "^4.1.5" + "typescript": "^4.1.5", + "rimraf": "3.0.2" }, "repository": { "type": "git", diff --git a/packages/quark-reactify/package.json b/packages/quark-reactify/package.json index 8dc17497..dcbb149b 100644 --- a/packages/quark-reactify/package.json +++ b/packages/quark-reactify/package.json @@ -5,7 +5,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "scripts": { - "build": "rm -rf lib && npx tsc", + "build": "rimraf lib && npx tsc", "release:major": "npm run release -- --release-as major", "release:minor": "npm run release -- --release-as minor", "release:patch": "npm run release -- --release-as patch", @@ -23,7 +23,8 @@ "@types/react": "^16.0.0", "react": "^16.10.0", "typescript": "^4.3.5", - "standard-version": "^9.3.0" + "standard-version": "^9.3.0", + "rimraf": "3.0.2" }, "author": "", "license": "MIT", diff --git a/packages/quark/package.json b/packages/quark/package.json index 404115c2..14c73d67 100644 --- a/packages/quark/package.json +++ b/packages/quark/package.json @@ -5,8 +5,8 @@ "main": "lib/index.js", "module": "lib/index.js", "scripts": { - "tsc": "rm -rf types && npx tsc -b ./tsconfig.types.json && node ./typesGenerat.js", - "build": "rm -rf umd && rm -rf lib && cross-env BABEL_ENV=umd rollup -c && npm run tsc", + "tsc": "rimraf types && npx tsc -b ./tsconfig.types.json && node ./typesGenerat.js", + "build": "rimraf umd && rimraf lib && cross-env BABEL_ENV=umd rollup -c && npm run tsc", "release:major": "npm run release -- --release-as major", "release:minor": "npm run release -- --release-as minor", "release:patch": "npm run release -- --release-as patch", @@ -66,7 +66,8 @@ "typescript": "^4.1.5", "rollup-plugin-filesize": "^9.1.2", "postcss-px-to-viewport": "^1.1.1", - "postcss": "8.4.16" + "postcss": "8.4.16", + "rimraf": "3.0.2" }, "engines": { "node": ">=12.0.0" diff --git a/yarn.lock b/yarn.lock index cef9a173..3cd276b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10977,7 +10977,7 @@ rimraf@2: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= From 08123da9bbc6c487cfea63991fb562b92332f4a7 Mon Sep 17 00:00:00 2001 From: yhy <18771350464@163.com> Date: Tue, 8 Nov 2022 15:22:34 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c58f4f7b..8f3d277e 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ 微信群已满员，请添加下面管理员拉你入群谢谢～
+
From 68e1192ab06fff2c8b777097f9a1862655e38528 Mon Sep 17 00:00:00 2001 From: zhuokuang <2183692898@qq.com> Date: Tue, 8 Nov 2022 15:25:23 +0800 Subject: [PATCH 4/4] fix: prop immediatecheck rename --- packages/quark/src/list/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/quark/src/list/index.tsx b/packages/quark/src/list/index.tsx index 132aeb7a..ade062ef 100644 --- a/packages/quark/src/list/index.tsx +++ b/packages/quark/src/list/index.tsx @@ -50,12 +50,12 @@ class QuarkList extends QuarkElement { @property({ type: Boolean }) - immediateCheck: boolean = true; + immediatecheck: boolean = true; placeholderRef: any = createRef(); componentDidMount() { - if(this.immediateCheck) { + if(this.immediatecheck) { setTimeout(() => this.check({ auto: true }), 50); } window.addEventListener('scroll', this.check, true);