From c6420d1ec8f74a273cc84149a6780040ac953599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B5=A9=E8=BF=9C?= Date: Mon, 10 Aug 2020 12:17:37 +0800 Subject: [PATCH] add case sensitivity option --- package-lock.json | 155 +++++++++++++------------ package.json | 2 +- src/components/cards/card.tsx | 3 +- src/components/cards/compact-card.tsx | 4 +- src/components/cards/default-card.tsx | 4 +- src/components/cards/highlights.tsx | 6 +- src/components/cards/list-card.tsx | 2 +- src/components/cards/magazine-card.tsx | 4 +- src/components/context-menu.tsx | 29 ++++- src/components/feeds/cards-feed.tsx | 2 +- src/components/feeds/feed.tsx | 4 +- src/components/feeds/list-feed.tsx | 2 +- src/components/settings/rules.tsx | 25 +++- src/containers/feed-container.tsx | 8 +- src/scripts/i18n/en-US.json | 3 +- src/scripts/i18n/zh-CN.json | 3 +- src/scripts/models/feed.ts | 9 +- src/scripts/models/rule.ts | 3 +- 18 files changed, 164 insertions(+), 104 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fe7cb9..9ee7f55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,56 +46,66 @@ "sumchecker": "^3.0.1" } }, + "@fluentui/date-time-utilities": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.4.0.tgz", + "integrity": "sha512-8zaFJ5I1AikQmoi5aWv/mustCf8UAFYUjJrrnlXwvXOe2HlC+wLZH236qRZPi4Wat8qG151vE24nTqzGMVldRQ==", + "dev": true, + "requires": { + "@uifabric/set-version": "^7.0.19", + "tslib": "^1.10.0" + } + }, "@fluentui/keyboard-key": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.1.tgz", - "integrity": "sha512-s2CYcspWWdqzwXNOvkNURifuRRiZun/5CQ3gcvRw9+S9/ONvPtedRkppNeTyj2wbW6Ctzf218bu2eJqu0aVK/Q==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.8.tgz", + "integrity": "sha512-GJW3NjDdigTddYuxoOuBGhOs5Egweqs6iPTDSUN+oAtXI/poYHVtgjxaFQx1OeAzD8wLXofGneAe/03ZW+TESA==", "dev": true, "requires": { "tslib": "^1.10.0" } }, "@fluentui/react": { - "version": "7.117.1", - "resolved": "https://registry.npmjs.org/@fluentui/react/-/react-7.117.1.tgz", - "integrity": "sha512-BKXFdZPjeOVdQksfLVM4YasDYk5LByTw7rGrW/z+Ae4RWRZ9JnLrfaPZSUSn4Puu5iKqipp3+WSU6BXcaPdvPA==", + "version": "7.126.2", + "resolved": "https://registry.npmjs.org/@fluentui/react/-/react-7.126.2.tgz", + "integrity": "sha512-WQ4u1oV0Cm+N2igltRIpg/B8LpxHiaiLue9++aZTtCvz4I5I5dRjm+LlVEomV5ml3n4m5apg9ml2MpNTQ7S+cA==", "dev": true, "requires": { - "@uifabric/set-version": "^7.0.13", - "office-ui-fabric-react": "^7.117.1", + "@uifabric/set-version": "^7.0.19", + "office-ui-fabric-react": "^7.126.2", "tslib": "^1.10.0" } }, "@fluentui/react-focus": { - "version": "7.12.5", - "resolved": "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.12.5.tgz", - "integrity": "sha512-K2DrfMI74pkuGeiqstWgqGVnMg836CE3eJ3fydkXa19+6lUjkB4yDrSgwrQkvvEXixCiJyfvAxyGuFJ74EKQwA==", + "version": "7.12.30", + "resolved": "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.12.30.tgz", + "integrity": "sha512-UV9StYMID9cRB2TQRE1u134sT8AOaOs0A2ZW4oM82/lzQ8XxL3aREFY0ohhmblYhEGzkb349y51h4eSqW5EpPA==", "dev": true, "requires": { - "@fluentui/keyboard-key": "^0.2.1", - "@uifabric/merge-styles": "^7.14.1", - "@uifabric/set-version": "^7.0.13", - "@uifabric/styling": "^7.12.15", - "@uifabric/utilities": "^7.20.3", + "@fluentui/keyboard-key": "^0.2.8", + "@uifabric/merge-styles": "^7.16.4", + "@uifabric/set-version": "^7.0.19", + "@uifabric/styling": "^7.14.10", + "@uifabric/utilities": "^7.26.1", "tslib": "^1.10.0" } }, "@fluentui/react-icons": { - "version": "0.1.24", - "resolved": "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.1.24.tgz", - "integrity": "sha512-PNAN1CjfBNL6p0fViftKDK8xcVnt05psEhO9wzCSOld9iw2eGu3JEObzolKGGoASvsiPJEQxbGOHZPuasVKVFg==", + "version": "0.1.45", + "resolved": "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.1.45.tgz", + "integrity": "sha512-xDE7dgbh3JgUt2uFUW66ut4V9T5irmxi+S5IGJKkXLUf3MHBysknx42BkX1Yc1Uczz3r5va1oWWwlXNiN/CjsA==", "dev": true, "requires": { - "@uifabric/set-version": "^7.0.13", - "@uifabric/styling": "^7.12.15", - "@uifabric/utilities": "^7.20.3", + "@microsoft/load-themed-styles": "^1.10.26", + "@uifabric/set-version": "^7.0.19", + "@uifabric/utilities": "^7.26.1", "tslib": "^1.10.0" } }, "@microsoft/load-themed-styles": { - "version": "1.10.55", - "resolved": "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.55.tgz", - "integrity": "sha512-1gT/zQVJC6dTvMAHfxteTlBmGsSHuLkKVe5vYCQ6JOzah8Yv9hwTSZESUZfj5HKV2PQ11KnVrT3TS815gKExoA==", + "version": "1.10.66", + "resolved": "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.66.tgz", + "integrity": "sha512-w1NCJQOrr5Ko5Og1ay7NO0vFUwxksddnLmVuY2bBi7DkgbFYtiRFQGkc+HMDpy2x6Fcy/iUTitbR674aX5TJhw==", "dev": true }, "@sindresorhus/is": { @@ -278,80 +288,80 @@ "dev": true }, "@uifabric/foundation": { - "version": "7.7.22", - "resolved": "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.7.22.tgz", - "integrity": "sha512-vTWhNT0wz0VB5DagSCPWQ+7d8Yv7AYOGsvOgPzS6FzA3pxSLX6xmN00ica1gCCZBz4xZn4Yw7YjcyF8bDARqSw==", + "version": "7.7.44", + "resolved": "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.7.44.tgz", + "integrity": "sha512-0YBZTGsVxQEd1+IYXawQcOd263auoXCQo2KE8CaL2aug330+9LIqloIyjnhDH+yJQ9JZZmzzlJ2clOD7NCT97g==", "dev": true, "requires": { - "@uifabric/merge-styles": "^7.14.1", - "@uifabric/set-version": "^7.0.13", - "@uifabric/styling": "^7.12.15", - "@uifabric/utilities": "^7.20.3", + "@uifabric/merge-styles": "^7.16.4", + "@uifabric/set-version": "^7.0.19", + "@uifabric/styling": "^7.14.10", + "@uifabric/utilities": "^7.26.1", "tslib": "^1.10.0" } }, "@uifabric/icons": { - "version": "7.3.48", - "resolved": "https://registry.npmjs.org/@uifabric/icons/-/icons-7.3.48.tgz", - "integrity": "sha512-DUhRluQrYAvvyElr5F/Gzkscl+gArgeEtLVJsjqXAsop8SAvJCEVCnSxVEZVDOOlsytEVVPpxiHGkaDow+26fg==", + "version": "7.3.70", + "resolved": "https://registry.npmjs.org/@uifabric/icons/-/icons-7.3.70.tgz", + "integrity": "sha512-ibAyKU02TFH6wdqrnu7keea9MaM29EGrMTkz24DyNlWfM+H9z3JL6UiWUeldgyok8HXDWI9GRQWB7f3YhJi60Q==", "dev": true, "requires": { - "@uifabric/set-version": "^7.0.13", - "@uifabric/styling": "^7.12.15", + "@uifabric/set-version": "^7.0.19", + "@uifabric/styling": "^7.14.10", "tslib": "^1.10.0" } }, "@uifabric/merge-styles": { - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.14.1.tgz", - "integrity": "sha512-nKkk0o9XyVh8HL174ZSDqw3IUnN2qb+kO73vg/rwioKPEQyuPGoEfij8jrb+CGpcCGnMYi53IeB1tm8ySlNatg==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.16.4.tgz", + "integrity": "sha512-OhOEtwYD74AARf4VZQJPan97QEvtTYcxBGVQfdE7YxFnvR1VdfMxOsV+9CAjAIFM+Xu5ibeKkEE/ZmJYnHkqsQ==", "dev": true, "requires": { - "@uifabric/set-version": "^7.0.13", + "@uifabric/set-version": "^7.0.19", "tslib": "^1.10.0" } }, "@uifabric/react-hooks": { - "version": "7.4.5", - "resolved": "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.4.5.tgz", - "integrity": "sha512-OLEBII+7x4rlTWjQ6hvMWS+CuWRJgvEfCsUcFMu5D5teXTr0bZQThyW8oVvkqKsNmF2JdwwqT6dSwhwgarlFzA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.7.3.tgz", + "integrity": "sha512-WAhMcnQSRgSQr0wkw8paESqxHCDWL2vdgTcDNKSj550GpAzD9BgZSBp3v3yln/qA4pN/nfjeU0CX9HujidSbMA==", "dev": true, "requires": { - "@uifabric/set-version": "^7.0.13", - "@uifabric/utilities": "^7.20.3", + "@uifabric/set-version": "^7.0.19", + "@uifabric/utilities": "^7.26.1", "tslib": "^1.10.0" } }, "@uifabric/set-version": { - "version": "7.0.13", - "resolved": "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.13.tgz", - "integrity": "sha512-SRsYaacvNykS9lRwKNJgrJuhPV4ytblthFNg0+Wi6+zvIf/w50k/nBlmXVetV5U9dAuX4njSkd+/3iOpgevkyw==", + "version": "7.0.19", + "resolved": "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.19.tgz", + "integrity": "sha512-p52z9Z5Kfl0kAU3DiPNPg+0vCdSAxlkRZEtEa+RwM6fh9XSo91n4C56FFdKDW7HJVuhGjMK7UEXuU6ELY1W7fg==", "dev": true, "requires": { "tslib": "^1.10.0" } }, "@uifabric/styling": { - "version": "7.12.15", - "resolved": "https://registry.npmjs.org/@uifabric/styling/-/styling-7.12.15.tgz", - "integrity": "sha512-mp/nRyE5Ig6a8BPEkXy/F8ckeQptQCm1SOQDPB1VT1PlknHoOXqqTVn2e1e2DGpWcpFIw4dbodqym3rgpUqkjA==", + "version": "7.14.10", + "resolved": "https://registry.npmjs.org/@uifabric/styling/-/styling-7.14.10.tgz", + "integrity": "sha512-hEmXCJJUVr+ykvPVXyvTHS5f2/GMCh1PObajuXgtpZVpJRzA+Rwgg5gBxWYeRNYw+3WZV62f0zAbmYh8ZCRAhQ==", "dev": true, "requires": { "@microsoft/load-themed-styles": "^1.10.26", - "@uifabric/merge-styles": "^7.14.1", - "@uifabric/set-version": "^7.0.13", - "@uifabric/utilities": "^7.20.3", + "@uifabric/merge-styles": "^7.16.4", + "@uifabric/set-version": "^7.0.19", + "@uifabric/utilities": "^7.26.1", "tslib": "^1.10.0" } }, "@uifabric/utilities": { - "version": "7.20.3", - "resolved": "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.20.3.tgz", - "integrity": "sha512-Amg+qdnNKx0yxjoEFHanM2jTCYfCZAlHPDHcS+BCiSwzeQrEPhlOrtZVPJtagNVhXLFiC09uDsmE/BF6dHb+ww==", + "version": "7.26.1", + "resolved": "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.26.1.tgz", + "integrity": "sha512-FX/Gu4XY6YlvBEyTyEeXUOtPpgTy1irHpSAE/vDbDZQlksVNv4FPnVingQZI9T/rA96ivP4q1PUutrb3X3hfsw==", "dev": true, "requires": { - "@uifabric/merge-styles": "^7.14.1", - "@uifabric/set-version": "^7.0.13", + "@uifabric/merge-styles": "^7.16.4", + "@uifabric/set-version": "^7.0.19", "prop-types": "^15.7.2", "tslib": "^1.10.0" } @@ -4753,21 +4763,22 @@ } }, "office-ui-fabric-react": { - "version": "7.117.1", - "resolved": "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.117.1.tgz", - "integrity": "sha512-AHjlLgBJmrVFOtL04V3qpljXVw2Z8sgcnzl5ZYBR4ZAGMdEtvzJBq5aMbUoQgh3jKHEgpLJfoznd4XWi75FshQ==", + "version": "7.126.2", + "resolved": "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.126.2.tgz", + "integrity": "sha512-1ETz4x5AsBZ36PBLIbL3T++Aso+9WudIsu3Z331UDNwSJF4LjOM50+PY/i7DUb+LSDzmwMwydCpU5yzEndLRBw==", "dev": true, "requires": { - "@fluentui/react-focus": "^7.12.5", - "@fluentui/react-icons": "^0.1.24", + "@fluentui/date-time-utilities": "^7.4.0", + "@fluentui/react-focus": "^7.12.30", + "@fluentui/react-icons": "^0.1.45", "@microsoft/load-themed-styles": "^1.10.26", - "@uifabric/foundation": "^7.7.22", - "@uifabric/icons": "^7.3.48", - "@uifabric/merge-styles": "^7.14.1", - "@uifabric/react-hooks": "^7.4.5", - "@uifabric/set-version": "^7.0.13", - "@uifabric/styling": "^7.12.15", - "@uifabric/utilities": "^7.20.3", + "@uifabric/foundation": "^7.7.44", + "@uifabric/icons": "^7.3.70", + "@uifabric/merge-styles": "^7.16.4", + "@uifabric/react-hooks": "^7.7.3", + "@uifabric/set-version": "^7.0.19", + "@uifabric/styling": "^7.14.10", + "@uifabric/utilities": "^7.26.1", "prop-types": "^15.7.2", "tslib": "^1.10.0" } diff --git a/package.json b/package.json index 623db63..b79134e 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ } }, "devDependencies": { - "@fluentui/react": "^7.115.3", + "@fluentui/react": "^7.126.2", "@types/nedb": "^1.8.9", "@types/react": "^16.9.35", "@types/react-dom": "^16.9.8", diff --git a/src/components/cards/card.tsx b/src/components/cards/card.tsx index 30c723b..db6566a 100644 --- a/src/components/cards/card.tsx +++ b/src/components/cards/card.tsx @@ -2,13 +2,14 @@ import * as React from "react" import { RSSSource, SourceOpenTarget } from "../../scripts/models/source" import { RSSItem } from "../../scripts/models/item" import { platformCtrl } from "../../scripts/utils" +import { FeedFilter } from "../../scripts/models/feed" export namespace Card { export type Props = { feedId: string item: RSSItem source: RSSSource - keyword: string + filter: FeedFilter shortcuts: (item: RSSItem, e: KeyboardEvent) => void markRead: (item: RSSItem) => void contextMenu: (feedId: string, item: RSSItem, e) => void diff --git a/src/components/cards/compact-card.tsx b/src/components/cards/compact-card.tsx index e3b09f7..7128806 100644 --- a/src/components/cards/compact-card.tsx +++ b/src/components/cards/compact-card.tsx @@ -18,8 +18,8 @@ const CompactCard: React.FunctionComponent = (props) => ( data-is-focusable>
- - + +