diff --git a/.changeset/moody-fireants-push.md b/.changeset/moody-fireants-push.md new file mode 100644 index 000000000..3d9dd2ba6 --- /dev/null +++ b/.changeset/moody-fireants-push.md @@ -0,0 +1,5 @@ +--- +"@alauda/ui": patch +--- + +feat: form item support plain input diff --git a/.changeset/sharp-steaks-do.md b/.changeset/sharp-steaks-do.md new file mode 100644 index 000000000..e3d1f9b8e --- /dev/null +++ b/.changeset/sharp-steaks-do.md @@ -0,0 +1,5 @@ +--- +"@alauda/ui": patch +--- + +fix: table placeholder will scroll as the header scrolls horizontally diff --git a/.changeset/sixty-toys-exist.md b/.changeset/sixty-toys-exist.md new file mode 100644 index 000000000..4288653dd --- /dev/null +++ b/.changeset/sixty-toys-exist.md @@ -0,0 +1,5 @@ +--- +"@alauda/ui": patch +--- + +fix: breadcrumb height diff --git a/.eslintignore b/.eslintignore index 0878362e1..6d0777a14 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,6 +2,6 @@ coverage dist release CHANGELOG.md -/tslint-rules +/.angular !/.*.js jest.setup.ts diff --git a/.eslintrc b/.eslintrc index 7bf5f4e24..28e03be6f 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,25 +4,58 @@ "requireConfigFile": false }, "overrides": [ + { + "files": "*.mdx", + "rules": { + "no-unused-expressions": "off" + } + }, + { + "files": "*.ts", + "excludedFiles": [ + "*.spec.ts", + "**/stories/**/*.ts" + ], + "rules": { + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": [ + "aui" + ], + "style": "kebab-case" + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": [ + "aui" + ], + "style": "camelCase" + } + ] + } + }, { "files": "*.spec.ts", "rules": { + "@angular-eslint/prefer-on-push-component-change-detection": "off", "@typescript-eslint/no-extraneous-class": "off", "jest/expect-expect": "off", "jest/no-export": "off", - "sonarjs/no-duplicate-string": 0 + "sonarjs/no-duplicate-string": "off" } } ], "rules": { - "accessor-pairs": "off", "@angular-eslint/no-inputs-metadata-property": "off", "@angular-eslint/no-output-native": "off", "@angular-eslint/no-input-rename": "off", "@angular-eslint/no-output-rename": "off", "@angular-eslint/no-host-metadata-property": "off", - "@typescript-eslint/no-useless-constructor": "off", - "@typescript-eslint/no-unsafe-call": "off", "@typescript-eslint/no-unsafe-argument": "off" } } diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cf75727d2..64f4ae800 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -9,14 +9,14 @@ # the `language` matrix defined below to confirm you have the correct set of # supported CodeQL languages. # -name: "CodeQL" +name: 'CodeQL' on: push: - branches: [ master ] + branches: [master] pull_request: # The branches below must be a subset of the branches above - branches: [ master ] + branches: [master] schedule: - cron: '33 11 * * 2' @@ -32,39 +32,39 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ['javascript'] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] # Learn more about CodeQL language support at https://git.io/codeql-language-support steps: - - name: Checkout repository - uses: actions/checkout@v2 + - name: Checkout repository + uses: actions/checkout@v3 - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 - # ℹ️ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language - #- run: | - # make bootstrap - # make release + #- run: | + # make bootstrap + # make release - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/release-beta.yml b/.github/workflows/release-beta.yml index 5c256c945..7ace150f9 100644 --- a/.github/workflows/release-beta.yml +++ b/.github/workflows/release-beta.yml @@ -10,28 +10,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 + cache: yarn - name: Link Yarn global binaries into PATH run: echo "$(yarn global bin)" >> $GITHUB_PATH - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install dependencies run: yarn --frozen-lockfile diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index f499ab8b6..f4da50496 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -13,28 +13,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 + cache: yarn - name: Link Yarn global binaries into PATH run: echo "$(yarn global bin)" >> $GITHUB_PATH - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install dependencies run: yarn --frozen-lockfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bba9e85ff..a80b9b9bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,41 +11,29 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 + cache: yarn - name: Link Yarn global binaries into PATH run: echo "$(yarn global bin)" >> $GITHUB_PATH - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install Dependencies - # https://github.com/atlassian/changesets/issues/246 - run: | - yarn --frozen-lockfile - rm -rf .git/hooks/commit-msg + run: yarn --frozen-lockfile - name: Create Release Pull Request or Publish to npm id: changesets uses: changesets/action@master with: + commit: 'chore: release @alauda/ui' + title: 'chore: release @alauda/ui' # This expects you to have a script called release which does a build for your packages and calls changeset publish publish: yarn release env: diff --git a/.github/workflows/stories.yml b/.github/workflows/stories.yml index c92c22b3b..3abaede99 100644 --- a/.github/workflows/stories.yml +++ b/.github/workflows/stories.yml @@ -10,28 +10,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 + cache: yarn - name: Link Yarn global binaries into PATH run: echo "$(yarn global bin)" >> $GITHUB_PATH - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install dependencies run: yarn --frozen-lockfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cb815b89e..496238cd3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,28 +8,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 16 + cache: yarn - name: Link Yarn global binaries into PATH run: echo "$(yarn global bin)" >> $GITHUB_PATH - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" - - - uses: actions/cache@v2 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Install Dependencies run: yarn --frozen-lockfile diff --git a/.remarkrc b/.remarkrc index 929ab5aff..8f576f80b 100644 --- a/.remarkrc +++ b/.remarkrc @@ -1,9 +1,14 @@ { "plugins": [ - "@1stg/remark-config", + "@1stg/config", + "gfm", [ "lint-no-file-name-irregular-characters", false + ], + [ + "lint-no-duplicate-headings", + false ] ] } diff --git a/.stylelintrc b/.stylelintrc index 3f557a60e..3b8525f40 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -3,8 +3,6 @@ "rules": { "no-descending-specificity": null, "plugin/no-unsupported-browser-features": null, - "scss/no-duplicate-dollar-variables": null, - "no-invalid-position-at-import-rule": null, "selector-class-pattern": null, "selector-type-no-unknown": [ true, @@ -14,5 +12,33 @@ ] } ] - } + }, + "overrides": [ + { + "files": "**/*.scss", + "rules": { + "no-invalid-position-at-import-rule": [ + true, + { + "ignoreAtRules": [ + "use" + ] + } + ], + "scss/no-duplicate-dollar-variables": null, + "scss/function-no-unknown": [ + true, + { + "ignoreFunctions": [ + "get-height-calc", + "use-rgb", + "use-rgba", + "use-text-color", + "use-var" + ] + } + ] + } + } + ] } diff --git a/README.md b/README.md index 48dd36c4e..dc6a4bc2f 100644 --- a/README.md +++ b/README.md @@ -85,4 +85,4 @@ yarn build ## LICENCE -[MIT](LICENCE) © [Alauda](http://www.alauda.io) +[MIT](LICENSE) © [Alauda](http://www.alauda.io) diff --git a/ng-package.json b/ng-package.json index 910e5437e..02e501803 100644 --- a/ng-package.json +++ b/ng-package.json @@ -2,6 +2,6 @@ "$schema": "./node_modules/ng-packagr/ng-package.schema.json", "dest": "./release", "lib": { - "entryFile": "./src/public-api.ts" + "entryFile": "./src/index.ts" } } diff --git a/package.json b/package.json index f4a3a9f79..c14e4ca39 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,10 @@ "debug": "yarn build:lib -p ng-package.debug.json && yarn build:copy --debug", "dev": "yarn start", "lint": "run-p lint:*", - "lint:es": "PARSER_NO_WATCH=true eslint . --cache --ext js,md,mdx,ts -f friendly", - "lint:style": "stylelint --cache '{src,stories}/**/*.{html,scss}'", - "lint:ts": "tslint -p . -t stylish", - "lint:tsc": "tsc -p tsconfig.json --noEmit", - "postinstall": "simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0", + "lint:es": "eslint . --cache -f friendly", + "lint:style": "stylelint --cache '{src,stories}/**/*.{html,scss,ts}'", + "lint:tsc": "tsc -p . --noEmit", + "prepare": "patch-package && simple-git-hooks && yarn-deduplicate --strategy fewer || exit 0", "prerelease": "yarn build", "release": "changeset publish", "start": "yarn storybook", @@ -50,64 +49,58 @@ "rxjs": "^7.0.0" }, "devDependencies": { - "@1stg/app-config": "3.0.0", - "@1stg/tslint-config": "3.0.0", - "@angular-devkit/build-angular": "^13.2.3", - "@angular-devkit/core": "^13.2.3", - "@angular/animations": "^13.2.2", - "@angular/cdk": "^13.2.2", - "@angular/cli": "^13.2.3", - "@angular/common": "^13.2.2", - "@angular/compiler": "^13.2.2", - "@angular/compiler-cli": "^13.2.2", - "@angular/core": "^13.2.2", - "@angular/forms": "^13.2.2", - "@angular/platform-browser": "^13.2.2", - "@angular/platform-browser-dynamic": "^13.2.2", - "@babel/runtime": "^7.17.2", - "@changesets/changelog-github": "^0.4.3", - "@changesets/cli": "^2.21.0", - "@storybook/addon-actions": "^6.4.18", - "@storybook/addon-docs": "^6.4.18", + "@1stg/app-config": "^3.5.0", + "@angular-devkit/build-angular": "^13.3.2", + "@angular-devkit/core": "^13.3.2", + "@angular/animations": "^13.3.2", + "@angular/cdk": "^13.3.2", + "@angular/cli": "^13.3.2", + "@angular/common": "^13.3.2", + "@angular/compiler": "^13.3.2", + "@angular/compiler-cli": "^13.3.2", + "@angular/core": "^13.3.2", + "@angular/forms": "^13.3.2", + "@angular/platform-browser": "^13.3.2", + "@angular/platform-browser-dynamic": "^13.3.2", + "@changesets/changelog-github": "^0.4.4", + "@changesets/cli": "^2.22.0", + "@storybook/addon-actions": "^6.4.20", + "@storybook/addon-docs": "^6.4.20", "@storybook/addon-knobs": "^6.1.21", - "@storybook/addon-storysource": "^6.4.18", - "@storybook/addons": "^6.4.18", - "@storybook/angular": "^6.4.18", - "@storybook/builder-webpack5": "^6.4.18", - "@storybook/cli": "^6.4.18", - "@storybook/manager-webpack5": "^6.4.18", - "@storybook/source-loader": "^6.4.18", + "@storybook/addon-storysource": "^6.4.20", + "@storybook/addons": "^6.4.20", + "@storybook/angular": "^6.4.20", + "@storybook/builder-webpack5": "^6.4.20", + "@storybook/cli": "^6.4.20", + "@storybook/manager-webpack5": "^6.4.20", + "@storybook/source-loader": "^6.4.20", "@types/chroma-js": "^2.1.3", "@types/file-saver": "^2.0.5", - "@types/jest": "^27.4.0", - "@types/node": "^16.11.24", + "@types/jest": "^27.4.1", + "@types/node": "^17.0.23", "@types/resize-observer-browser": "^0.1.5", "chroma-js": "^2.1.2", - "clipboard-polyfill": "^3.0.2", - "css-loader": "^6.6.0", - "dayjs": "^1.10.4", + "css-loader": "^6.7.1", + "dayjs": "^1.11.0", "file-saver": "^2.0.5", "gulp": "^4.0.2", "gulp-dart-sass": "^1.0.2", "jest": "^27.5.1", - "jest-junit": "^13.0.0", + "jest-junit": "^13.1.0", "jest-preset-angular": "^11.1.1", - "ng-packagr": "^13.2.1", - "npm-run-all": "^4.1.5", + "ng-packagr": "^13.3.0", + "patch-package": "^6.4.7", "postcss": "^8.4.6", + "remark-gfm": "^3.0.1", "rxjs": "^7.5.4", "sass-loader": "^12.6.0", "storybook-dark-mode": "^1.0.8", "style-loader": "^3.3.1", - "tsconfig-paths-webpack-plugin": "^3.5.2", - "tslib": "^2.1.0", - "tslint": "^6.1.3", - "typescript": "^4.5.5", - "webpack": "^5.68.0", - "yarn-deduplicate": "^3.1.0" + "webpack": "^5.71.0", + "zone.js": "^0.11.5" }, "resolutions": { - "lint-staged": "11.1.4" + "prettier": "^2.6.2" }, "publishConfig": { "access": "public", diff --git a/patches/eslint-mdx+2.0.0-next.1.patch b/patches/eslint-mdx+2.0.0-next.1.patch new file mode 100644 index 000000000..c1e687bae --- /dev/null +++ b/patches/eslint-mdx+2.0.0-next.1.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/eslint-mdx/lib/parser.js b/node_modules/eslint-mdx/lib/parser.js +index 88e9c2e..dc94af5 100644 +--- a/node_modules/eslint-mdx/lib/parser.js ++++ b/node_modules/eslint-mdx/lib/parser.js +@@ -6,7 +6,7 @@ const path_1 = tslib_1.__importDefault(require("path")); + const helpers_1 = require("./helpers"); + const processor_1 = require("./processor"); + const traverse_1 = require("./traverse"); +-exports.AST_PROPS = ['body', 'comments']; ++exports.AST_PROPS = []; + exports.DEFAULT_EXTENSIONS = ['.mdx']; + exports.MARKDOWN_EXTENSIONS = ['.md']; + class Parser { diff --git a/scripts/publish-version.js b/scripts/publish-version.js index 940fcfe62..330ad891c 100644 --- a/scripts/publish-version.js +++ b/scripts/publish-version.js @@ -1,6 +1,5 @@ const { execSync } = require('child_process'); -// eslint-disable-next-line node/no-extraneous-require const semver = require('semver'); let version = process.env.PUBLISH_VERSION || 'patch'; diff --git a/src/accordion/accordion-item/accordion-item.component.html b/src/accordion/accordion-item/accordion-item.component.html index 10eb9d591..d33c7040f 100644 --- a/src/accordion/accordion-item/accordion-item.component.html +++ b/src/accordion/accordion-item/accordion-item.component.html @@ -22,7 +22,10 @@ [id]="id" [@expand]="expanded ? 'expanded' : 'collapsed'" > -
+
diff --git a/src/accordion/accordion-item/accordion-item.component.ts b/src/accordion/accordion-item/accordion-item.component.ts index 1ef46dcc0..4d4301000 100644 --- a/src/accordion/accordion-item/accordion-item.component.ts +++ b/src/accordion/accordion-item/accordion-item.component.ts @@ -48,7 +48,8 @@ export class AccordionItemContentDirective {} }) export class AccordionItemComponent extends CdkAccordionItem - implements AfterContentInit { + implements AfterContentInit +{ @Input() background = true; diff --git a/src/accordion/accordion.component.html b/src/accordion/accordion.component.html index c448b5ffe..a3e1f7f68 100644 --- a/src/accordion/accordion.component.html +++ b/src/accordion/accordion.component.html @@ -1,3 +1,6 @@ -
+
diff --git a/src/accordion/accordion.component.spec.ts b/src/accordion/accordion.component.spec.ts index 46d2cf488..274e3bea2 100644 --- a/src/accordion/accordion.component.spec.ts +++ b/src/accordion/accordion.component.spec.ts @@ -2,7 +2,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AccordionComponent, AccordionModule } from '../public-api'; +import { AccordionComponent, AccordionModule } from '.'; describe('AccordionComponent', () => { let fixture: ComponentFixture; @@ -44,7 +44,11 @@ describe('AccordionComponent', () => { @Component({ template: ` - +
header1
content
diff --git a/src/accordion/accordion.module.ts b/src/accordion/accordion.module.ts index 851ff26e4..acb7d0434 100644 --- a/src/accordion/accordion.module.ts +++ b/src/accordion/accordion.module.ts @@ -2,8 +2,8 @@ import { CdkAccordionModule } from '@angular/cdk/accordion'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ButtonModule } from '../button/public-api'; -import { IconModule } from '../icon/public-api'; +import { ButtonModule } from '../button'; +import { IconModule } from '../icon'; import { AccordionItemComponent, diff --git a/src/accordion/public-api.ts b/src/accordion/public-api.ts deleted file mode 100644 index 281d42f0c..000000000 --- a/src/accordion/public-api.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './accordion-item/accordion-item.component'; -export * from './accordion.component'; -export * from './accordion.module'; diff --git a/src/anchor/anchor.directive.ts b/src/anchor/anchor.directive.ts index f5f1629a9..0463325ac 100644 --- a/src/anchor/anchor.directive.ts +++ b/src/anchor/anchor.directive.ts @@ -29,7 +29,6 @@ import { AnchorComponent } from './anchor.component'; let uid = 0; @Directive() -// tslint:disable-next-line: directive-class-suffix export class AnchorDirectiveChild { readonly parent: AnchorDirective; diff --git a/src/anchor/public-api.ts b/src/anchor/public-api.ts deleted file mode 100644 index 7ac8cccf7..000000000 --- a/src/anchor/public-api.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './anchor.component'; -export * from './anchor.directive'; -export * from './anchor.module'; -export * from './types'; -export * from './utils'; diff --git a/src/autocomplete/autocomplete.component.html b/src/autocomplete/autocomplete.component.html index d3c551a4f..b5970152d 100644 --- a/src/autocomplete/autocomplete.component.html +++ b/src/autocomplete/autocomplete.component.html @@ -5,7 +5,10 @@ [style.minWidth]="width" (mousedown)="$event.preventDefault()" > -
+
) => combineLatest(suggestions.map(suggestion => suggestion.visible$)), ), - map(visible => visible.some(value => value)), + map(visible => visible.some(Boolean)), distinctUntilChanged(), debounceTime(0), tap(() => { diff --git a/src/autocomplete/autocomplete.directive.ts b/src/autocomplete/autocomplete.directive.ts index 734ed7319..96ce079bb 100644 --- a/src/autocomplete/autocomplete.directive.ts +++ b/src/autocomplete/autocomplete.directive.ts @@ -1,4 +1,3 @@ -// tslint:disable: no-output-rename import { Overlay } from '@angular/cdk/overlay'; import { AfterViewInit, @@ -20,11 +19,7 @@ import { NgControl } from '@angular/forms'; import { BehaviorSubject, Observable, Subject, fromEvent } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { - BaseTooltip, - TooltipTrigger, - TooltipType, -} from '../tooltip/public-api'; +import { BaseTooltip, TooltipTrigger, TooltipType } from '../tooltip'; import { scrollIntoView } from '../utils'; import { AutocompleteComponent } from './autocomplete.component'; diff --git a/src/autocomplete/autocomplete.module.ts b/src/autocomplete/autocomplete.module.ts index 81260f1a9..59cc26db9 100644 --- a/src/autocomplete/autocomplete.module.ts +++ b/src/autocomplete/autocomplete.module.ts @@ -2,7 +2,7 @@ import { OverlayModule } from '@angular/cdk/overlay'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { TooltipModule } from '../tooltip/public-api'; +import { TooltipModule } from '../tooltip'; import { AutocompletePlaceholderComponent } from './autocomplete-placeholder.component'; import { AutocompleteComponent } from './autocomplete.component'; diff --git a/src/autocomplete/public-api.ts b/src/autocomplete/public-api.ts deleted file mode 100644 index 0402de319..000000000 --- a/src/autocomplete/public-api.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './autocomplete.directive'; -export * from './autocomplete.component'; -export * from './suggestion/suggestion.component'; -export * from './suggestion-group/suggestion-group.component'; -export * from './autocomplete-placeholder.component'; -export * from './helper-directives'; -export * from './autocomplete.module'; -export * from './autocomplete.types'; diff --git a/src/autocomplete/suggestion-group/suggestion-group.component.html b/src/autocomplete/suggestion-group/suggestion-group.component.html index 9154f7420..8a07daaa5 100644 --- a/src/autocomplete/suggestion-group/suggestion-group.component.html +++ b/src/autocomplete/suggestion-group/suggestion-group.component.html @@ -1,4 +1,7 @@ -
+
diff --git a/src/autocomplete/suggestion-group/suggestion-group.component.ts b/src/autocomplete/suggestion-group/suggestion-group.component.ts index a96879b3f..ee3bacab5 100644 --- a/src/autocomplete/suggestion-group/suggestion-group.component.ts +++ b/src/autocomplete/suggestion-group/suggestion-group.component.ts @@ -40,7 +40,7 @@ export class SuggestionGroupComponent implements AfterContentInit { ? combineLatest(options.map(node => node.visible$)) : of([false]), ), - map(visible => visible.some(value => value)), + map(visible => visible.some(Boolean)), publishReplay(1), refCount(), ); diff --git a/src/back-top/back-top.component.html b/src/back-top/back-top.component.html index 14134a89c..09aa63175 100644 --- a/src/back-top/back-top.component.html +++ b/src/back-top/back-top.component.html @@ -3,5 +3,8 @@ (click)="handleClick($event)" [class.show]="isDisplayed$ | async" > - +
diff --git a/src/back-top/public-api.ts b/src/back-top/public-api.ts deleted file mode 100644 index 2131a7706..000000000 --- a/src/back-top/public-api.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './back-top.component'; -export * from './back-top.module'; diff --git a/src/breadcrumb/breadcrumb-item.component.html b/src/breadcrumb/breadcrumb-item.component.html index 2ab80953b..07b1a11f2 100644 --- a/src/breadcrumb/breadcrumb-item.component.html +++ b/src/breadcrumb/breadcrumb-item.component.html @@ -2,6 +2,9 @@ {{ separator }} - +
diff --git a/src/breadcrumb/breadcrumb.module.ts b/src/breadcrumb/breadcrumb.module.ts index fcb970837..b00855e9b 100644 --- a/src/breadcrumb/breadcrumb.module.ts +++ b/src/breadcrumb/breadcrumb.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IconModule } from '../icon/public-api'; +import { IconModule } from '../icon'; import { BreadcrumbItemComponent } from './breadcrumb-item.component'; import { BreadcrumbComponent } from './breadcrumb.component'; diff --git a/src/breadcrumb/public-api.ts b/src/breadcrumb/public-api.ts deleted file mode 100644 index d08d89dd8..000000000 --- a/src/breadcrumb/public-api.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './breadcrumb-item.component'; -export * from './breadcrumb.component'; -export * from './breadcrumb.module'; diff --git a/src/button/button.component.html b/src/button/button.component.html index 0a9503ad2..2a608d9e9 100644 --- a/src/button/button.component.html +++ b/src/button/button.component.html @@ -1,2 +1,6 @@ - + diff --git a/src/button/button.component.scss b/src/button/button.component.scss index d2e015318..b5f9192f6 100644 --- a/src/button/button.component.scss +++ b/src/button/button.component.scss @@ -204,6 +204,7 @@ $button-size: ( &.isPlain { color: use-text-color(main); + &[disabled] { color: use-rgb(n-6); } @@ -243,6 +244,7 @@ $button-size: ( &.isPlain { color: use-text-color(main); + &[disabled] { color: use-rgb(n-6); } @@ -298,12 +300,15 @@ $button-size: ( &--primary { @include colorful-button(primary); } + &--success { @include colorful-button(green); } + &--warning { @include colorful-button(yellow); } + &--danger { @include colorful-button(red); } diff --git a/src/button/button.component.spec.ts b/src/button/button.component.spec.ts index 0845cd2a5..aaffe456d 100644 --- a/src/button/button.component.spec.ts +++ b/src/button/button.component.spec.ts @@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'; import { ComponentSize } from '../types'; -import { ButtonModule, ButtonType } from './public-api'; +import { ButtonModule, ButtonType } from '.'; describe('ButtonComponent', () => { let fixture: ComponentFixture; diff --git a/src/button/button.component.ts b/src/button/button.component.ts index fb5c4cadf..9e146bd12 100644 --- a/src/button/button.component.ts +++ b/src/button/button.component.ts @@ -16,7 +16,7 @@ import { ButtonType } from './button.types'; const prefix = 'aui-button--'; @Component({ - // tslint:disable-next-line: component-selector + // eslint-disable-next-line @angular-eslint/component-selector selector: 'button[aui-button]', templateUrl: './button.component.html', styleUrls: ['./button.component.scss'], diff --git a/src/button/button.module.ts b/src/button/button.module.ts index 61fdf201b..3d595f197 100644 --- a/src/button/button.module.ts +++ b/src/button/button.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IconModule } from '../icon/public-api'; +import { IconModule } from '../icon'; import { ButtonGroupComponent } from './button-group/button-group.component'; import { ButtonComponent } from './button.component'; diff --git a/src/button/public-api.ts b/src/button/public-api.ts deleted file mode 100644 index 634cd6a4a..000000000 --- a/src/button/public-api.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './button.module'; -export * from './button.component'; -export * from './button-group/button-group.component'; -export * from './button.types'; diff --git a/src/card/card.component.html b/src/card/card.component.html index db750db23..b9592f194 100644 --- a/src/card/card.component.html +++ b/src/card/card.component.html @@ -1,4 +1,7 @@ -
+
diff --git a/src/card/helper-directives.ts b/src/card/helper-directives.ts index e06b38778..277e22d00 100644 --- a/src/card/helper-directives.ts +++ b/src/card/helper-directives.ts @@ -1,4 +1,3 @@ -// tslint:disable: no-host-metadata-property import { Directive } from '@angular/core'; @Directive({ diff --git a/src/card/public-api.ts b/src/card/public-api.ts deleted file mode 100644 index f54fd90fe..000000000 --- a/src/card/public-api.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './section.component'; -export * from './card.component'; -export * from './card.module'; -export * from './helper-directives'; diff --git a/src/checkbox/checkbox-group/checkbox-group.component.spec.ts b/src/checkbox/checkbox-group/checkbox-group.component.spec.ts index 6290a4ac9..399db1870 100644 --- a/src/checkbox/checkbox-group/checkbox-group.component.spec.ts +++ b/src/checkbox/checkbox-group/checkbox-group.component.spec.ts @@ -24,10 +24,12 @@ describe('CheckboxGroupComponent', () => { fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); ins = fixture.componentInstance; - el1 = fixture.debugElement.query(By.css('.group1 aui-checkbox-group')) - .nativeElement; - el2 = fixture.debugElement.query(By.css('.group2 aui-checkbox-group')) - .nativeElement; + el1 = fixture.debugElement.query( + By.css('.group1 aui-checkbox-group'), + ).nativeElement; + el2 = fixture.debugElement.query( + By.css('.group2 aui-checkbox-group'), + ).nativeElement; }); it('should checkbox init checked state by value array', fakeAsync(() => { @@ -74,12 +76,22 @@ describe('CheckboxGroupComponent', () => { box0 box1 box2 - box3 + box3
- - + + {{ v.name }} diff --git a/src/checkbox/checkbox-group/checkbox-group.component.ts b/src/checkbox/checkbox-group/checkbox-group.component.ts index b5005719a..fb2433937 100644 --- a/src/checkbox/checkbox-group/checkbox-group.component.ts +++ b/src/checkbox/checkbox-group/checkbox-group.component.ts @@ -9,8 +9,8 @@ import { } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { CommonFormControl } from '../../form/public-api'; -import { TrackFn } from '../../select/public-api'; +import { CommonFormControl } from '../../form'; +import { TrackFn } from '../../select'; import { CheckboxComponent } from '../checkbox.component'; @Component({ diff --git a/src/checkbox/checkbox.component.html b/src/checkbox/checkbox.component.html index 0cf12395b..7d5e6e091 100644 --- a/src/checkbox/checkbox.component.html +++ b/src/checkbox/checkbox.component.html @@ -16,7 +16,10 @@ (click)="onClick()" (blur)="onBlur()" /> -
- +
diff --git a/src/date-picker/calendar/panel/picker-panel.ts b/src/date-picker/calendar/panel/picker-panel.ts index 6225ab283..7c8b1b0aa 100644 --- a/src/date-picker/calendar/panel/picker-panel.ts +++ b/src/date-picker/calendar/panel/picker-panel.ts @@ -132,15 +132,26 @@ export class PickerPanelComponent implements OnChanges { this.panelData = [[]]; } const [...values] = getDatePanelIterable(date, navRange, this.weekStartDay); - if (navRange === DateNavRange.Month) { - colCounts = DAY_PANEL_COLUMN_COUNT; - rowCounts = DAY_PANEL_ROW_COUNT; - } else if (navRange === DateNavRange.Decade) { - colCounts = YEAR_PANEL_COLUMN_COUNT; - rowCounts = YEAR_PANEL_ROW_COUNT; - } else if (navRange === DateNavRange.Year) { - colCounts = MONTH_PANEL_COLUMN_COUNT; - rowCounts = MONTH_PANEL_ROW_COUNT; + switch (navRange) { + case DateNavRange.Month: { + colCounts = DAY_PANEL_COLUMN_COUNT; + rowCounts = DAY_PANEL_ROW_COUNT; + + break; + } + case DateNavRange.Decade: { + colCounts = YEAR_PANEL_COLUMN_COUNT; + rowCounts = YEAR_PANEL_ROW_COUNT; + + break; + } + case DateNavRange.Year: { + colCounts = MONTH_PANEL_COLUMN_COUNT; + rowCounts = MONTH_PANEL_ROW_COUNT; + + break; + } + // No default } for (let k = 0; k < rowCounts; k++) { const row = []; diff --git a/src/date-picker/calendar/range-picker-panel/style.scss b/src/date-picker/calendar/range-picker-panel/style.scss index 713d31b93..1a6cae6a1 100644 --- a/src/date-picker/calendar/range-picker-panel/style.scss +++ b/src/date-picker/calendar/range-picker-panel/style.scss @@ -12,27 +12,33 @@ $block: aui-date-range-picker-panel; .placeholder { color: use-text-color(placeholder); + &.separator { margin-inline: 12px; } } + .date-value { color: use-text-color(main); } + .date-holder { display: inline-block; margin-right: 8px; width: 82px; } + .panel__wrapper { width: $range-picker-header-width; display: flex; justify-content: center; } } + &__header { display: flex; justify-content: space-between; + aui-calendar-header { flex: 0 0 $range-picker-header-width; } @@ -43,11 +49,13 @@ $block: aui-date-range-picker-panel; justify-content: space-between; margin: 16px 0; } + &__footer { .aui-time-picker { width: 88px; } } + &__footer-content { display: flex; align-items: center; diff --git a/src/date-picker/calendar/range-picker-panel/template.html b/src/date-picker/calendar/range-picker-panel/template.html index 8a76b4d6b..4adc11d19 100644 --- a/src/date-picker/calendar/range-picker-panel/template.html +++ b/src/date-picker/calendar/range-picker-panel/template.html @@ -54,7 +54,10 @@ (confirm)="confirmValue(rangeValue)" *ngIf="showFooter && showTime" > -
+
- {{ placeholder }} - {{ - value | date: FOOTER_DATE_FORMAT - }} + + {{ placeholder }} + {{ value | date: FOOTER_DATE_FORMAT }} diff --git a/src/date-picker/calendar/util.ts b/src/date-picker/calendar/util.ts index e01c20668..64ead5998 100644 --- a/src/date-picker/calendar/util.ts +++ b/src/date-picker/calendar/util.ts @@ -36,18 +36,29 @@ export function getDatePanelIterable( let firstData: Dayjs; let counts = 0; date = date.clone(); - if (navRange === DateNavRange.Month) { - firstData = date.date(-1).day(weekStartDay); - if (firstData.isAfter(date)) { - firstData = firstData.subtract(1, 'week'); + switch (navRange) { + case DateNavRange.Month: { + firstData = date.date(-1).day(weekStartDay); + if (firstData.isAfter(date)) { + firstData = firstData.subtract(1, 'week'); + } + counts = DAY_PANEL_COLUMN_COUNT * DAY_PANEL_ROW_COUNT; + + break; + } + case DateNavRange.Year: { + firstData = date.month(0); + counts = MONTH_PANEL_COLUMN_COUNT * MONTH_PANEL_ROW_COUNT; + + break; } - counts = DAY_PANEL_COLUMN_COUNT * DAY_PANEL_ROW_COUNT; - } else if (navRange === DateNavRange.Year) { - firstData = date.month(0); - counts = MONTH_PANEL_COLUMN_COUNT * MONTH_PANEL_ROW_COUNT; - } else if (navRange === DateNavRange.Decade) { - firstData = date.subtract(1, YEAR); - counts = YEAR_PANEL_COLUMN_COUNT * YEAR_PANEL_ROW_COUNT; + case DateNavRange.Decade: { + firstData = date.subtract(1, YEAR); + counts = YEAR_PANEL_COLUMN_COUNT * YEAR_PANEL_ROW_COUNT; + + break; + } + // No default } let i = 0; return { @@ -181,10 +192,10 @@ export function updateDateByTimeModel(date: Dayjs, time: TimePickerModel) { : date; } -export const composeDisabledDateFn = (...fns: DisabledDateFn[]) => ( - date: Dayjs, - navRange: DateNavRange, -) => !fns.filter(i => !!i).every(fn => !fn(date, navRange)); +export const composeDisabledDateFn = + (...fns: DisabledDateFn[]) => + (date: Dayjs, navRange: DateNavRange) => + !fns.filter(i => !!i).every(fn => !fn(date, navRange)); export function minDate(a: Dayjs, b: Dayjs, unit: UnitType = 'date') { return !a ? b : !b ? a : a.isBefore(b, unit) ? a : b; diff --git a/src/date-picker/date-picker.module.ts b/src/date-picker/date-picker.module.ts index cdf3af2c6..cfe4c86e5 100644 --- a/src/date-picker/date-picker.module.ts +++ b/src/date-picker/date-picker.module.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ButtonModule } from '../button/public-api'; -import { I18nModule } from '../i18n/public-api'; +import { ButtonModule } from '../button'; +import { I18nModule } from '../i18n'; import { IconModule } from '../icon/icon.module'; -import { InputModule } from '../input/public-api'; -import { TimePickerModule } from '../time-picker/public-api'; -import { TooltipModule } from '../tooltip/public-api'; +import { InputModule } from '../input'; +import { TimePickerModule } from '../time-picker'; +import { TooltipModule } from '../tooltip'; import { DatePickerPanelComponent } from './calendar/date-picker-panel/component'; import { CalendarFooterComponent } from './calendar/footer/component'; diff --git a/src/date-picker/date-picker.type.ts b/src/date-picker/date-picker.type.ts index fd442cb6f..1c0e49ee8 100644 --- a/src/date-picker/date-picker.type.ts +++ b/src/date-picker/date-picker.type.ts @@ -5,9 +5,7 @@ export enum Side { Right = 'right', } -export type DisabledTimeFn = ( - date?: ConfigType, -) => { +export type DisabledTimeFn = (date?: ConfigType) => { hours: () => number[]; minutes: (hour?: number) => number[]; seconds: (hour?: number, minute?: number) => number[]; diff --git a/src/date-picker/date-picker/date-picker.component.ts b/src/date-picker/date-picker/date-picker.component.ts index 09a5fdcd4..9c9a88ec4 100644 --- a/src/date-picker/date-picker/date-picker.component.ts +++ b/src/date-picker/date-picker/date-picker.component.ts @@ -21,7 +21,6 @@ import { DateNavRange, DisabledTimeFn } from '../date-picker.type'; selector: 'aui-date-picker', templateUrl: './date-picker.template.html', changeDetection: ChangeDetectionStrategy.OnPush, - // tslint:disable-next-line: validate-decorators encapsulation: ViewEncapsulation.Emulated, providers: [ { @@ -34,7 +33,8 @@ import { DateNavRange, DisabledTimeFn } from '../date-picker.type'; }) export class DatePickerComponent extends CommonFormControl - implements OnInit { + implements OnInit +{ @Input() clearable = true; diff --git a/src/date-picker/public-api.ts b/src/date-picker/public-api.ts deleted file mode 100644 index 6e57e9061..000000000 --- a/src/date-picker/public-api.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from './date-picker.module'; -export * from './range-picker/range-picker.component'; -export * from './date-picker.type'; -export * from './calendar/footer/component'; -export * from './calendar/header/component'; -export * from './calendar/panel/picker-panel'; -export * from './calendar/range-picker-panel/component'; -export * from './calendar/date-picker-panel/component'; -export * from './calendar/constant'; -export * from './trigger/trigger.component'; -export * from './date-picker/date-picker.component'; diff --git a/src/date-picker/range-picker/range-picker.component.ts b/src/date-picker/range-picker/range-picker.component.ts index 127793621..5895b1363 100644 --- a/src/date-picker/range-picker/range-picker.component.ts +++ b/src/date-picker/range-picker/range-picker.component.ts @@ -18,7 +18,6 @@ import { DisabledDateFn, DisabledTimeFn } from '../date-picker.type'; selector: 'aui-range-picker', templateUrl: './range-picker.template.html', // provide tooltip class - // tslint:disable-next-line: validate-decorators encapsulation: ViewEncapsulation.Emulated, providers: [ { diff --git a/src/date-picker/trigger/trigger.component.ts b/src/date-picker/trigger/trigger.component.ts index 7a60ee1ef..d430c3d85 100644 --- a/src/date-picker/trigger/trigger.component.ts +++ b/src/date-picker/trigger/trigger.component.ts @@ -18,7 +18,6 @@ const bem = buildBem('aui-date-picker-trigger'); @Component({ selector: 'aui-date-picker-trigger', templateUrl: './trigger.template.html', - // tslint:disable-next-line: validate-decorators encapsulation: ViewEncapsulation.Emulated, changeDetection: ChangeDetectionStrategy.OnPush, styleUrls: ['./trigger.style.scss'], diff --git a/src/date-picker/trigger/trigger.template.html b/src/date-picker/trigger/trigger.template.html index 7eeda24d7..f71884087 100644 --- a/src/date-picker/trigger/trigger.template.html +++ b/src/date-picker/trigger/trigger.template.html @@ -21,9 +21,11 @@ (blur)="leftFocus = false; blur.next()" [placeholder]="startPlaceholder || ('start_date' | auiI18n)" /> - {{ - 'to' | auiI18n - }} + {{ 'to' | auiI18n }} - + { return 'check_circle_s'; case ConfirmType.Danger: return 'exclamation_triangle_s'; - case ConfirmType.Primary: - case ConfirmType.Warning: default: return 'exclamation_circle_s'; } diff --git a/src/dialog/dialog-content/dialog-header.component.html b/src/dialog/dialog-content/dialog-header.component.html index a8eef0944..255f2c990 100644 --- a/src/dialog/dialog-content/dialog-header.component.html +++ b/src/dialog/dialog-content/dialog-header.component.html @@ -1,4 +1,7 @@ -
+
+
diff --git a/src/dialog/dialog.component.ts b/src/dialog/dialog.component.ts index e9b4fac3c..3d4468d15 100644 --- a/src/dialog/dialog.component.ts +++ b/src/dialog/dialog.component.ts @@ -23,7 +23,7 @@ import { throwDialogContentAlreadyAttachedError } from './utils'; templateUrl: './dialog.component.html', styleUrls: ['./dialog.component.scss'], encapsulation: ViewEncapsulation.None, - // tslint:disable-next-line:validate-decorators + // eslint-disable-next-line @angular-eslint/prefer-on-push-component-change-detection changeDetection: ChangeDetectionStrategy.Default, preserveWhitespaces: false, }) diff --git a/src/dialog/dialog.module.ts b/src/dialog/dialog.module.ts index b4da72c53..0227c3415 100644 --- a/src/dialog/dialog.module.ts +++ b/src/dialog/dialog.module.ts @@ -3,8 +3,8 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ButtonModule } from '../button/public-api'; -import { IconModule } from '../icon/public-api'; +import { ButtonModule } from '../button'; +import { IconModule } from '../icon'; import { ConfirmDialogComponent } from './confirm-dialog/confirm-dialog.component'; import { DialogCloseDirective } from './dialog-content/dialog-close.directive'; diff --git a/src/dialog/dialog.service.spec.ts b/src/dialog/dialog.service.spec.ts index 9f29dad10..c6c72059f 100644 --- a/src/dialog/dialog.service.spec.ts +++ b/src/dialog/dialog.service.spec.ts @@ -1,5 +1,11 @@ import { OverlayContainer } from '@angular/cdk/overlay'; -import { Component, NgModule, TemplateRef, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + NgModule, + TemplateRef, + ViewChild, +} from '@angular/core'; import { ComponentFixture, TestBed, @@ -9,7 +15,7 @@ import { } from '@angular/core/testing'; import { timer } from 'rxjs'; -import { DialogModule, DialogService, DialogSize } from './public-api'; +import { DialogModule, DialogService, DialogSize } from '.'; describe('DialogService', () => { let fixture: ComponentFixture; @@ -112,6 +118,7 @@ describe('DialogService', () => { content: 'custom content', }) .catch(() => { + // eslint-disable-next-line jest/no-conditional-expect expect(ocEl.querySelector('aui-dialog')).toBeNull(); resolve(); }); @@ -194,6 +201,7 @@ describe('DialogService', () => { // eslint-disable-next-line sonarjs/no-identical-functions .catch(() => { const t2 = Date.now(); + // eslint-disable-next-line jest/no-conditional-expect expect(t2 - t1).toBeGreaterThanOrEqual(100); resolve(); }); @@ -220,14 +228,16 @@ describe('DialogService', () => { // eslint-disable-next-line sonarjs/no-identical-functions .catch(() => { const t2 = Date.now(); + // eslint-disable-next-line jest/no-conditional-expect expect(t2 - t1).toBeGreaterThanOrEqual(100); resolve(); }); fixture.detectChanges(); - const cancelBtn: HTMLButtonElement = ocEl.querySelector( + // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion -- no idea + const cancelBtn = ocEl.querySelector( '.aui-confirm-dialog__cancel-button', - ); + ) as HTMLButtonElement; cancelBtn.dispatchEvent(new Event('click')); fixture.detectChanges(); @@ -278,9 +288,15 @@ describe('DialogService', () => { template: ` title - + `, + changeDetection: ChangeDetectionStrategy.OnPush, }) class TestComponent { result: any; @@ -289,18 +305,24 @@ class TestComponent { } @Component({ - // tslint:disable-next-line: component-selector selector: 'test-dialog-content', template: ` title content
- - + +
`, + changeDetection: ChangeDetectionStrategy.OnPush, }) class DialogContentComponent {} diff --git a/src/dialog/dialog.service.ts b/src/dialog/dialog.service.ts index 886b14984..db9e7665d 100644 --- a/src/dialog/dialog.service.ts +++ b/src/dialog/dialog.service.ts @@ -97,17 +97,15 @@ export class DialogService { private hiddenPrevDialog() { if (this.openDialogs.length > 0) { - this.openDialogs[ - this.openDialogs.length - 1 - ].dialogInstance.hidden = true; + this.openDialogs[this.openDialogs.length - 1].dialogInstance.hidden = + true; } } private showPrevDialog() { if (this.openDialogs.length > 0) { - this.openDialogs[ - this.openDialogs.length - 1 - ].dialogInstance.hidden = false; + this.openDialogs[this.openDialogs.length - 1].dialogInstance.hidden = + false; } } diff --git a/src/dialog/public-api.ts b/src/dialog/public-api.ts deleted file mode 100644 index 012c4f98a..000000000 --- a/src/dialog/public-api.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from './dialog.module'; -export * from './dialog.service'; -export * from './dialog.types'; -export * from './dialog-ref'; -export * from './dialog-config'; -export * from './confirm-dialog/confirm-dialog-config'; -export * from './dialog-content/dialog-close.directive'; -export * from './dialog-content/dialog-content.component'; -export * from './dialog-content/dialog-footer.component'; -export * from './dialog-content/dialog-header.component'; -export * from './dialog.component'; diff --git a/src/drawer/component/drawer.component.html b/src/drawer/component/drawer.component.html index c79187ee5..a57e3145e 100644 --- a/src/drawer/component/drawer.component.html +++ b/src/drawer/component/drawer.component.html @@ -31,7 +31,11 @@ >
-
+
@@ -49,7 +53,10 @@
-
+
diff --git a/src/drawer/drawer.module.ts b/src/drawer/drawer.module.ts index 828fca14a..0ff9acd22 100644 --- a/src/drawer/drawer.module.ts +++ b/src/drawer/drawer.module.ts @@ -3,7 +3,7 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IconModule } from '../icon/public-api'; +import { IconModule } from '../icon'; import { DrawerComponent } from './component/drawer.component'; import { diff --git a/src/drawer/drawer.service.ts b/src/drawer/drawer.service.ts index 37aa517be..cafb7af9a 100644 --- a/src/drawer/drawer.service.ts +++ b/src/drawer/drawer.service.ts @@ -5,7 +5,8 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { DrawerComponent } from './component/drawer.component'; -import { DrawerSize } from './public-api'; + +import { DrawerSize } from '.'; export interface DrawerOptions { title?: string | TemplateRef; diff --git a/src/drawer/public-api.ts b/src/drawer/public-api.ts deleted file mode 100644 index 120cd7ad6..000000000 --- a/src/drawer/public-api.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './drawer.module'; -export * from './component/drawer.component'; -export * from './drawer.service'; -export * from './component/helper-directives'; -export * from './component/drawer-ref'; diff --git a/src/dropdown/dropdown-active.directive.ts b/src/dropdown/dropdown-active.directive.ts index b964d2904..887141419 100644 --- a/src/dropdown/dropdown-active.directive.ts +++ b/src/dropdown/dropdown-active.directive.ts @@ -1,6 +1,6 @@ import { Directive, Input } from '@angular/core'; -import { TooltipActiveDirective } from '../tooltip/public-api'; +import { TooltipActiveDirective } from '../tooltip'; @Directive({ selector: '[auiDropdownActive]', diff --git a/src/dropdown/dropdown-button/dropdown-button.component.ts b/src/dropdown/dropdown-button/dropdown-button.component.ts index 78924ea77..9bbbf2958 100644 --- a/src/dropdown/dropdown-button/dropdown-button.component.ts +++ b/src/dropdown/dropdown-button/dropdown-button.component.ts @@ -8,7 +8,7 @@ import { ViewEncapsulation, } from '@angular/core'; -import { ButtonType } from '../../button/public-api'; +import { ButtonType } from '../../button'; import { ComponentSize } from '../../types'; import { Bem, buildBem, coerceAttrBoolean } from '../../utils'; import { MenuComponent } from '../menu/menu.component'; diff --git a/src/dropdown/dropdown.directive.ts b/src/dropdown/dropdown.directive.ts index c429475d6..8de5edd29 100644 --- a/src/dropdown/dropdown.directive.ts +++ b/src/dropdown/dropdown.directive.ts @@ -1,4 +1,3 @@ -// tslint:disable: no-output-rename import { Overlay } from '@angular/cdk/overlay'; import { ChangeDetectorRef, @@ -14,11 +13,7 @@ import { } from '@angular/core'; import { debounceTime } from 'rxjs/operators'; -import { - BaseTooltip, - TooltipTrigger, - TooltipType, -} from '../tooltip/public-api'; +import { BaseTooltip, TooltipTrigger, TooltipType } from '../tooltip'; import { DropdownActiveDirective } from './dropdown-active.directive'; import { MenuComponent } from './menu/menu.component'; diff --git a/src/dropdown/dropdown.module.ts b/src/dropdown/dropdown.module.ts index 9579b35b7..efdc1a24d 100644 --- a/src/dropdown/dropdown.module.ts +++ b/src/dropdown/dropdown.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ButtonModule } from '../button/public-api'; -import { IconModule } from '../icon/public-api'; -import { TooltipModule } from '../tooltip/public-api'; +import { ButtonModule } from '../button'; +import { IconModule } from '../icon'; +import { TooltipModule } from '../tooltip'; import { DropdownActiveDirective } from './dropdown-active.directive'; import { DropdownButtonComponent } from './dropdown-button/dropdown-button.component'; diff --git a/src/dropdown/menu-item/menu-item.component.html b/src/dropdown/menu-item/menu-item.component.html index cd3bc960e..d84a35f8b 100644 --- a/src/dropdown/menu-item/menu-item.component.html +++ b/src/dropdown/menu-item/menu-item.component.html @@ -1,3 +1,6 @@ - diff --git a/src/dropdown/menu-item/mixin.scss b/src/dropdown/menu-item/mixin.scss index 4be573fd3..06c65a76f 100644 --- a/src/dropdown/menu-item/mixin.scss +++ b/src/dropdown/menu-item/mixin.scss @@ -26,6 +26,7 @@ &:hover { background-color: use-rgb(p-6); } + &.isActive { color: use-rgb(primary); background-color: use-rgb(p-6); @@ -34,6 +35,7 @@ &--primary { color: use-rgb(primary); + &:hover, &.isActive { background-color: use-rgb(p-6); @@ -51,6 +53,7 @@ &--warning { color: use-rgb(yellow); + &:hover, &.isActive { background-color: use-rgb(y-6); @@ -59,6 +62,7 @@ &--danger { color: use-rgb(red); + &:hover, &.isActive { background-color: use-rgb(r-6); @@ -81,6 +85,7 @@ &:not(:first-child) .hasDivider { overflow: visible; margin-top: use-var(spacing-xl); + &:before { content: ''; position: absolute; diff --git a/src/dropdown/public-api.ts b/src/dropdown/public-api.ts deleted file mode 100644 index 0da67da37..000000000 --- a/src/dropdown/public-api.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from './dropdown.directive'; -export * from './dropdown-active.directive'; -export * from './dropdown-button/dropdown-button.component'; -export * from './menu/menu.component'; -export * from './menu-group/menu-group.component'; -export * from './menu/menu-content.directive'; -export * from './menu-item/menu-item.component'; -export * from './submenu/submenu.component'; -export * from './dropdown.module'; -export * from './dropdown.types'; -export * from './helper-directives'; diff --git a/src/dropdown/submenu/submenu.component.html b/src/dropdown/submenu/submenu.component.html index 67e049981..b2e52ceec 100644 --- a/src/dropdown/submenu/submenu.component.html +++ b/src/dropdown/submenu/submenu.component.html @@ -11,9 +11,15 @@ (click)="$event.stopPropagation()" > - + - + diff --git a/src/dropdown/submenu/submenu.component.ts b/src/dropdown/submenu/submenu.component.ts index 5ae76e897..d51da3974 100644 --- a/src/dropdown/submenu/submenu.component.ts +++ b/src/dropdown/submenu/submenu.component.ts @@ -7,7 +7,7 @@ import { ViewEncapsulation, } from '@angular/core'; -import { TooltipTrigger } from '../../tooltip/public-api'; +import { TooltipTrigger } from '../../tooltip'; import { ComponentSize } from '../../types'; import { Bem, buildBem } from '../../utils'; import { MenuItemComponent } from '../menu-item/menu-item.component'; diff --git a/src/form/common-form.ts b/src/form/common-form.ts index 2c6e8b670..2b7ea7f89 100644 --- a/src/form/common-form.ts +++ b/src/form/common-form.ts @@ -15,7 +15,6 @@ import { coerceAttrBoolean } from '../utils'; * 也可以分别传入 value 和 监听 valueChange 事件以实现阻断用户操作的功能。 */ @Directive() -// tslint:disable-next-line:directive-class-suffix export class CommonFormControl implements ControlValueAccessor { @Input() get disabled() { diff --git a/src/form/form-item/form-item.component.html b/src/form/form-item/form-item.component.html index 27a27b572..3473300f6 100644 --- a/src/form/form-item/form-item.component.html +++ b/src/form/form-item/form-item.component.html @@ -17,7 +17,10 @@
-
+
-
+
diff --git a/src/form/form-item/form-item.component.ts b/src/form/form-item/form-item.component.ts index a912f103e..7c0b04ffe 100644 --- a/src/form/form-item/form-item.component.ts +++ b/src/form/form-item/form-item.component.ts @@ -111,7 +111,7 @@ export class FormItemComponent implements AfterContentInit, OnDestroy { switchMap((controls: QueryList) => combineLatest( controls.map(control => this.mapControlStatus(control)), - ).pipe(map(statuses => statuses.some(status => status))), + ).pipe(map(statuses => statuses.some(Boolean))), ), ); diff --git a/src/form/form.component.spec.ts b/src/form/form.component.spec.ts index c851e3eba..9a357069a 100644 --- a/src/form/form.component.spec.ts +++ b/src/form/form.component.spec.ts @@ -48,8 +48,18 @@ describe('FormComponent', () => { minlength="3" [(ngModel)]="value1" /> -
required
-
minlength: 3
+
+ required +
+
+ minlength: 3 +
input your name
addon
diff --git a/src/form/helper-directives.ts b/src/form/helper-directives.ts index a7a2e00ab..57dfc9e93 100644 --- a/src/form/helper-directives.ts +++ b/src/form/helper-directives.ts @@ -1,4 +1,3 @@ -// tslint:disable: no-host-metadata-property import { Directive, Input } from '@angular/core'; import { coerceAttrBoolean } from '../utils'; diff --git a/src/form/public-api.ts b/src/form/public-api.ts deleted file mode 100644 index d84dceffd..000000000 --- a/src/form/public-api.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from './form-item/form-item.component'; -export * from './form.directive'; -export * from './form.module'; -export * from './common-form'; -export * from './helper-directives'; -export * from './form.types'; diff --git a/src/i18n/public-api.ts b/src/i18n/public-api.ts deleted file mode 100644 index 14120b988..000000000 --- a/src/i18n/public-api.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from './i18n.module'; -export * from './i18n.pipe'; -export * from './i18n.type'; -export * from './i18n.service'; -export * from './language/en'; -export * from './language/zh'; diff --git a/src/icon/icon-register.service.ts b/src/icon/icon-register.service.ts index 50c68a2fa..5352cbfd1 100644 --- a/src/icon/icon-register.service.ts +++ b/src/icon/icon-register.service.ts @@ -62,6 +62,7 @@ export class IconRegisterService { } } +// eslint-disable-next-line sonar/function-name export function ICON_REGISTER_PROVIDER_FACTORY( parentRegister: IconRegisterService, document: Document, diff --git a/src/icon/icon.component.html b/src/icon/icon.component.html index 33f2d1810..eabc681d5 100644 --- a/src/icon/icon.component.html +++ b/src/icon/icon.component.html @@ -15,8 +15,14 @@ x2="150" y2="180" > - - + + - - + + diff --git a/src/icon/icon.component.scss b/src/icon/icon.component.scss index 2a2a9f045..b29d51a57 100644 --- a/src/icon/icon.component.scss +++ b/src/icon/icon.component.scss @@ -9,7 +9,7 @@ aui-icon { width: 1em; height: 1em; vertical-align: -0.125em; - fill: currentColor; + fill: currentcolor; &__background { width: 1em; @@ -46,6 +46,7 @@ aui-icon + aui-icon > .aui-icon { 0% { transform: rotateZ(0deg); } + 100% { transform: rotateZ(360deg); } diff --git a/src/icon/icon.component.spec.ts b/src/icon/icon.component.spec.ts index 2321ab6e5..3be3b679d 100644 --- a/src/icon/icon.component.spec.ts +++ b/src/icon/icon.component.spec.ts @@ -2,7 +2,7 @@ import { Component, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { IconModule } from './public-api'; +import { IconModule } from '.'; describe('IconComponent', () => { let fixture: ComponentFixture; diff --git a/src/icon/icon.module.ts b/src/icon/icon.module.ts index 53f039f03..45c21e5a2 100644 --- a/src/icon/icon.module.ts +++ b/src/icon/icon.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ThemeModule } from '../theme/public-api'; +import { ThemeModule } from '../theme'; import { ICON_REGISTER_SERVICE_PROVIDER } from './icon-register.service'; import { IconComponent } from './icon.component'; diff --git a/src/icon/public-api.ts b/src/icon/public-api.ts deleted file mode 100644 index 53b6e88c9..000000000 --- a/src/icon/public-api.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './icon.component'; -export * from './icon.module'; -export * from './icon-register.service'; diff --git a/src/inline-alert/inline-alert.component.html b/src/inline-alert/inline-alert.component.html index ce4d0165b..0caf2f956 100644 --- a/src/inline-alert/inline-alert.component.html +++ b/src/inline-alert/inline-alert.component.html @@ -9,7 +9,10 @@ [background]="iconMap(type).endsWith('_triangle_s') ? 'triangle' : 'circle'" >
-
+
{{ title }}
diff --git a/src/inline-alert/inline-alert.component.spec.ts b/src/inline-alert/inline-alert.component.spec.ts index 64a16ee40..c7f9de86c 100644 --- a/src/inline-alert/inline-alert.component.spec.ts +++ b/src/inline-alert/inline-alert.component.spec.ts @@ -2,11 +2,7 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - InlineAlertComponent, - InlineAlertModule, - InlineAlertType, -} from './public-api'; +import { InlineAlertComponent, InlineAlertModule, InlineAlertType } from '.'; describe('InlineAlertComponent', () => { let fixture: ComponentFixture; @@ -26,24 +22,30 @@ describe('InlineAlertComponent', () => { ins.title = 'text title 1'; fixture.detectChanges(); expect( - (fixture.debugElement.query( - By.css('#inline-alert .aui-inline-alert__title'), - ).nativeElement as HTMLElement).textContent, + ( + fixture.debugElement.query( + By.css('#inline-alert .aui-inline-alert__title'), + ).nativeElement as HTMLElement + ).textContent, ).toContain('text title 1'); ins.content = 'text content 1'; fixture.detectChanges(); expect( - (fixture.debugElement.query( - By.css('#inline-alert .aui-inline-alert__content'), - ).nativeElement as HTMLElement).textContent, + ( + fixture.debugElement.query( + By.css('#inline-alert .aui-inline-alert__content'), + ).nativeElement as HTMLElement + ).textContent, ).toContain('text content 1'); }); it('should be closed by click close button', () => { - (fixture.debugElement.query( - By.css('#inline-alert .aui-inline-alert__close'), - ).nativeElement as HTMLElement).click(); + ( + fixture.debugElement.query( + By.css('#inline-alert .aui-inline-alert__close'), + ).nativeElement as HTMLElement + ).click(); fixture.detectChanges(); expect( fixture.debugElement.query(By.css('#inline-alert aui-inline-alert')), @@ -55,9 +57,11 @@ describe('InlineAlertComponent', () => { ins.inlineAlertRef.close.subscribe(() => { resolve(); }); - (fixture.debugElement.query( - By.css('#inline-alert .aui-inline-alert__close'), - ).nativeElement as HTMLElement).click(); + ( + fixture.debugElement.query( + By.css('#inline-alert .aui-inline-alert__close'), + ).nativeElement as HTMLElement + ).click(); fixture.detectChanges(); })); @@ -91,8 +95,10 @@ describe('InlineAlertComponent', () => { fixture.componentInstance.type = type; fixture.detectChanges(); expect( - (fixture.debugElement.query(By.css('#inline-alert .aui-inline-alert')) - .nativeElement as HTMLElement).className, + ( + fixture.debugElement.query(By.css('#inline-alert .aui-inline-alert')) + .nativeElement as HTMLElement + ).className, ).toContain(`aui-inline-alert--${type}`); } }); diff --git a/src/inline-alert/inline-alert.component.ts b/src/inline-alert/inline-alert.component.ts index f27c0ba66..6014de7e6 100644 --- a/src/inline-alert/inline-alert.component.ts +++ b/src/inline-alert/inline-alert.component.ts @@ -53,8 +53,6 @@ export class InlineAlertComponent { case InlineAlertType.Danger: case InlineAlertType.Error: return 'exclamation_triangle_s'; - case InlineAlertType.Primary: - case InlineAlertType.Info: default: return 'info_circle_s'; } diff --git a/src/inline-alert/inline-alert.module.ts b/src/inline-alert/inline-alert.module.ts index d4808566e..b992a8535 100644 --- a/src/inline-alert/inline-alert.module.ts +++ b/src/inline-alert/inline-alert.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IconModule } from '../icon/public-api'; +import { IconModule } from '../icon'; import { InlineAlertTitleDirective } from './helper-directives'; import { InlineAlertComponent } from './inline-alert.component'; diff --git a/src/inline-alert/public-api.ts b/src/inline-alert/public-api.ts deleted file mode 100644 index b15a0268d..000000000 --- a/src/inline-alert/public-api.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './inline-alert.types'; -export * from './inline-alert.component'; -export * from './helper-directives'; -export * from './inline-alert.module'; diff --git a/src/input/autosize.directive.ts b/src/input/autosize.directive.ts index e3c0f3e32..bc0fd8eaa 100644 --- a/src/input/autosize.directive.ts +++ b/src/input/autosize.directive.ts @@ -26,7 +26,7 @@ export interface AutoSizeValue { */ @Directive({ selector: - // tslint:disable-next-line: directive-selector + // eslint-disable-next-line @angular-eslint/directive-selector 'textarea[autosize][ngModel],textarea[autosize][formControl],textarea[autosize][formControlName]', exportAs: 'TextareaAutosize', }) diff --git a/src/input/input-group/input-group.component.html b/src/input/input-group/input-group.component.html index 03078c956..65c52ed78 100644 --- a/src/input/input-group/input-group.component.html +++ b/src/input/input-group/input-group.component.html @@ -14,15 +14,24 @@
- + - +
-
+
diff --git a/src/input/input-group/input-group.component.scss b/src/input/input-group/input-group.component.scss index 8483f5c40..895ea7cb5 100644 --- a/src/input/input-group/input-group.component.scss +++ b/src/input/input-group/input-group.component.scss @@ -68,6 +68,7 @@ border-right: none; border-radius: use-var(border-radius-m) 0 0 use-var(border-radius-m); } + &--after { border-left: none; border-radius: 0 use-var(border-radius-m) use-var(border-radius-m) 0; diff --git a/src/input/input-group/input-group.component.spec.ts b/src/input/input-group/input-group.component.spec.ts index ebfbd62db..76d0c926a 100644 --- a/src/input/input-group/input-group.component.spec.ts +++ b/src/input/input-group/input-group.component.spec.ts @@ -2,9 +2,9 @@ import { Component, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { IconModule } from '../../icon/public-api'; +import { InputModule } from '..'; +import { IconModule } from '../../icon'; import { ComponentSize } from '../../types'; -import { InputModule } from '../public-api'; describe('InputGroupComponent', () => { let fixture: ComponentFixture; @@ -91,9 +91,19 @@ describe('InputGroupComponent', () => { HTTPS GB - - - + + + `, }) diff --git a/src/input/input.component.scss b/src/input/input.component.scss index cc18f3dde..7d38be107 100644 --- a/src/input/input.component.scss +++ b/src/input/input.component.scss @@ -18,12 +18,12 @@ &::-webkit-outer-spin-button, &::-webkit-inner-spin-button { - -webkit-appearance: none; + appearance: none; margin: 0; } &[type='number'] { - -moz-appearance: textfield; + appearance: textfield; } &::placeholder { diff --git a/src/input/input.component.spec.ts b/src/input/input.component.spec.ts index bf307ef34..a813a4c17 100644 --- a/src/input/input.component.spec.ts +++ b/src/input/input.component.spec.ts @@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'; import { ComponentSize } from '../types'; -import { InputModule } from './public-api'; +import { InputModule } from '.'; describe('InputComponent', () => { let fixture: ComponentFixture; diff --git a/src/input/input.component.ts b/src/input/input.component.ts index ea4442fed..cafcfb0dc 100644 --- a/src/input/input.component.ts +++ b/src/input/input.component.ts @@ -13,7 +13,7 @@ import { ComponentSize } from '../types'; import { coerceAttrBoolean } from '../utils'; @Component({ - // tslint:disable-next-line: component-selector + // eslint-disable-next-line @angular-eslint/component-selector selector: 'input[aui-input],textarea[aui-input]', template: '', styleUrls: ['./input.component.scss'], diff --git a/src/input/input.module.ts b/src/input/input.module.ts index 00fafef6d..546554721 100644 --- a/src/input/input.module.ts +++ b/src/input/input.module.ts @@ -2,10 +2,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { ButtonModule } from '../button/public-api'; -import { IconModule } from '../icon/public-api'; +import { ButtonModule } from '../button'; +import { IconModule } from '../icon'; import { SharedModule } from '../shared/shared.module'; -import { TagModule } from '../tag/public-api'; +import { TagModule } from '../tag'; import { AutosizeDirective } from './autosize.directive'; import { diff --git a/src/input/number-input/number-input.component.scss b/src/input/number-input/number-input.component.scss index c6ce01fe9..ceb572572 100644 --- a/src/input/number-input/number-input.component.scss +++ b/src/input/number-input/number-input.component.scss @@ -31,11 +31,13 @@ $block: 'aui-number-input'; &.isDisabled { border: 1px solid use-rgb(n-7); + &:hover { cursor: not-allowed; } .#{$block}__input { color: use-rgb(n-6); + &:hover { cursor: not-allowed; } @@ -48,9 +50,11 @@ $block: 'aui-number-input'; border: unset; width: use-var(icon-size-xl); height: use-var(icon-size-xl); + aui-icon { font-size: use-var(font-size-s); } + .aui-button__content { padding: unset; } @@ -65,9 +69,11 @@ $block: 'aui-number-input'; background-color: transparent; color: use-text-color(main); text-align: center; + &:focus { border: unset; } + &:focus-visible { outline: unset; } diff --git a/src/input/number-input/number-input.component.spec.ts b/src/input/number-input/number-input.component.spec.ts index 3f68f87b2..da63b2090 100644 --- a/src/input/number-input/number-input.component.spec.ts +++ b/src/input/number-input/number-input.component.spec.ts @@ -8,7 +8,7 @@ import { import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; -import { InputModule, NumberInputComponent } from '../public-api'; +import { InputModule, NumberInputComponent } from '..'; describe('InputNumberComponent', () => { let fixture: ComponentFixture; diff --git a/src/input/number-input/number-input.component.ts b/src/input/number-input/number-input.component.ts index 31db08193..0c9b2f5f2 100644 --- a/src/input/number-input/number-input.component.ts +++ b/src/input/number-input/number-input.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { CommonFormControl } from '../../form/public-api'; +import { CommonFormControl } from '../../form'; import { ComponentSize } from '../../types'; import { Bem, buildBem, coerceNumber } from '../../utils'; @@ -31,7 +31,8 @@ import { Bem, buildBem, coerceNumber } from '../../utils'; }) export class NumberInputComponent extends CommonFormControl - implements AfterViewInit { + implements AfterViewInit +{ bem: Bem = buildBem('aui-number-input'); @Input() diff --git a/src/input/public-api.ts b/src/input/public-api.ts deleted file mode 100644 index 55cb2e5ec..000000000 --- a/src/input/public-api.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './input.component'; -export * from './input-group/input-group.component'; -export * from './search/search.component'; -export * from './tags-input/tags-input.component'; -export * from './input.module'; -export * from './number-input/number-input.component'; -export * from './autosize.directive'; -export * from './helper-directives'; diff --git a/src/input/search/search.component.html b/src/input/search/search.component.html index 392857d88..0ce0a1a24 100644 --- a/src/input/search/search.component.html +++ b/src/input/search/search.component.html @@ -6,7 +6,10 @@ [class.isSearching]="searching" [class.isDisabled]="disabled" > -
+
-
+
{ let fixture: ComponentFixture; diff --git a/src/input/tags-input/tags-input.component.html b/src/input/tags-input/tags-input.component.html index 223e5d475..8479f9a35 100644 --- a/src/input/tags-input/tags-input.component.html +++ b/src/input/tags-input/tags-input.component.html @@ -32,7 +32,9 @@ (keydown)="onKeyDown($event)" (input)="onInput()" /> - {{ - inputRef.value - }} + {{ inputRef.value }}
diff --git a/src/input/tags-input/tags-input.component.ts b/src/input/tags-input/tags-input.component.ts index 09c740f76..355f1a6d3 100644 --- a/src/input/tags-input/tags-input.component.ts +++ b/src/input/tags-input/tags-input.component.ts @@ -25,7 +25,7 @@ import { } from '@angular/forms'; import { take } from 'rxjs'; -import { CommonFormControl } from '../../form/public-api'; +import { CommonFormControl } from '../../form'; import { ComponentSize } from '../../types'; import { Bem, buildBem } from '../../utils'; diff --git a/src/input/tags-input/with-max-row-count.ts b/src/input/tags-input/with-max-row-count.ts index be6d33071..dd839017d 100644 --- a/src/input/tags-input/with-max-row-count.ts +++ b/src/input/tags-input/with-max-row-count.ts @@ -29,7 +29,7 @@ export function createWithMaxRowCount< maxRowCount: number; customRowHeight?: number; size: ComponentSize; - } + }, >(component: T) { const hostPosition = () => (component.maxRowCount > 0 ? 'relative' : null); const hostDisplay = () => (component.maxRowCount ? 'block' : null); diff --git a/src/input/utils/index.ts b/src/input/utils/index.ts index cb68dc138..1284b3bed 100644 --- a/src/input/utils/index.ts +++ b/src/input/utils/index.ts @@ -58,9 +58,8 @@ export function calcTextareaHeight( document.body.append(hiddenTextarea); } - const { paddingSize, borderSize, contextStyle } = calculateNodeStyling( - targetElement, - ); + const { paddingSize, borderSize, contextStyle } = + calculateNodeStyling(targetElement); hiddenTextarea.setAttribute('style', `${contextStyle};${HIDDEN_STYLE}`); hiddenTextarea.value = targetElement.value || targetElement.placeholder || ''; diff --git a/src/message/base-message.ts b/src/message/base-message.ts index a93b81101..e64c5868d 100644 --- a/src/message/base-message.ts +++ b/src/message/base-message.ts @@ -23,7 +23,7 @@ import { export abstract class BaseMessage< Wrapper extends MessageWrapperComponent, Component extends MessageComponent, - Config extends MessageConfig + Config extends MessageConfig, > { wrapperInstance: { elementRef: ElementRef }; componentRefs: Array> = []; diff --git a/src/message/message.service.spec.ts b/src/message/message.service.spec.ts index efa6e920f..482d8ff78 100644 --- a/src/message/message.service.spec.ts +++ b/src/message/message.service.spec.ts @@ -1,9 +1,15 @@ import { OverlayContainer } from '@angular/cdk/overlay'; -import { Component, NgModule, TemplateRef, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + NgModule, + TemplateRef, + ViewChild, +} from '@angular/core'; import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { MESSAGE_CONFIG, MessageModule, MessageService } from './public-api'; +import { MESSAGE_CONFIG, MessageModule, MessageService } from '.'; describe('MessageService', () => { let fixture: ComponentFixture; @@ -17,7 +23,7 @@ describe('MessageService', () => { { provide: MESSAGE_CONFIG, useValue: { - duration: 10000, + duration: 10_000, maxStack: 3, }, }, @@ -82,6 +88,7 @@ describe('MessageService', () => { @Component({ template: '', + changeDetection: ChangeDetectionStrategy.OnPush, }) export class TestComponent { @ViewChild('template', { static: true }) diff --git a/src/message/public-api.ts b/src/message/public-api.ts deleted file mode 100644 index 5fd3448b9..000000000 --- a/src/message/public-api.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './message.module'; -export * from './message.service'; -export * from './message.config'; diff --git a/src/notification/notification.component.html b/src/notification/notification.component.html index 3c6b86ffc..bcf2517df 100644 --- a/src/notification/notification.component.html +++ b/src/notification/notification.component.html @@ -10,8 +10,18 @@ >
-
{{ title }}
-
{{ content }}
+
+ {{ title }} +
+
+ {{ content }} +
@@ -23,11 +33,17 @@ >
-
+
{{ remains > 0 ? remains : 1 }}s
-
+
diff --git a/src/notification/notification.component.ts b/src/notification/notification.component.ts index 4c8a32742..a7ecd2782 100644 --- a/src/notification/notification.component.ts +++ b/src/notification/notification.component.ts @@ -1,11 +1,7 @@ -import { - CdkPortalOutlet, - TemplatePortal, -} from '@angular/cdk/portal'; +import { CdkPortalOutlet, TemplatePortal } from '@angular/cdk/portal'; import { AfterViewInit, ChangeDetectionStrategy, - ChangeDetectorRef, Component, EmbeddedViewRef, HostListener, @@ -57,13 +53,6 @@ export class NotificationComponent @ViewChild('modalComponent', { read: ViewContainerRef, static: true }) private readonly modalEl: ViewContainerRef; - constructor( - viewContainerRef: ViewContainerRef, - cdr: ChangeDetectorRef, - ) { - super(viewContainerRef, cdr); - } - @HostListener('mouseenter') onMouseEnter() { if (this.duration <= 0) { diff --git a/src/notification/notification.config.ts b/src/notification/notification.config.ts index e60f10780..06ed82e31 100644 --- a/src/notification/notification.config.ts +++ b/src/notification/notification.config.ts @@ -1,7 +1,7 @@ import { ComponentType } from '@angular/cdk/portal'; import { InjectionToken, TemplateRef } from '@angular/core'; -import { MessageConfig, MessageGlobalConfig } from '../message/public-api'; +import { MessageConfig, MessageGlobalConfig } from '../message'; export interface NotificationConfig extends MessageConfig { title?: string; @@ -11,6 +11,7 @@ export interface NotificationConfig extends MessageConfig { customClass?: string; } +// eslint-disable-next-line no-restricted-syntax export type NotificationGlobalConfig = MessageGlobalConfig; export const NOTIFICATION_CONFIG = new InjectionToken( diff --git a/src/notification/notification.module.ts b/src/notification/notification.module.ts index a79020a2b..816860b8e 100644 --- a/src/notification/notification.module.ts +++ b/src/notification/notification.module.ts @@ -3,7 +3,7 @@ import { PortalModule } from '@angular/cdk/portal'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IconModule } from '../icon/public-api'; +import { IconModule } from '../icon'; import { NotificationWrapperComponent } from './notification-wrapper.component'; import { NotificationComponent } from './notification.component'; diff --git a/src/notification/notification.service.spec.ts b/src/notification/notification.service.spec.ts index c26709fa8..e56a9fca3 100644 --- a/src/notification/notification.service.spec.ts +++ b/src/notification/notification.service.spec.ts @@ -7,7 +7,7 @@ import { NOTIFICATION_CONFIG, NotificationModule, NotificationService, -} from './public-api'; +} from '.'; describe('NotificationService', () => { let fixture: ComponentFixture; @@ -87,7 +87,7 @@ describe('NotificationService', () => { it('should show a success notification with template', () => { notificationService.success({ contentRef: fixture.componentInstance.templateRef, - duration: 10000, + duration: 10_000, }); fixture.detectChanges(); diff --git a/src/notification/public-api.ts b/src/notification/public-api.ts deleted file mode 100644 index 5a34986a5..000000000 --- a/src/notification/public-api.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './notification.module'; -export * from './notification.component'; -export * from './notification.service'; -export * from './notification.config'; diff --git a/src/paginator/paginator-intl.ts b/src/paginator/paginator-intl.ts index baab8beeb..4b36416ba 100644 --- a/src/paginator/paginator-intl.ts +++ b/src/paginator/paginator-intl.ts @@ -22,6 +22,7 @@ export class PaginatorIntl { getTotalLabel = (length: number) => `Total ${length}`; } +// eslint-disable-next-line sonar/function-name export function PAGINATOR_INTL_PROVIDER_FACTORY(parentIntl: PaginatorIntl) { return parentIntl || new PaginatorIntl(); } diff --git a/src/paginator/paginator.component.html b/src/paginator/paginator.component.html index 17f5511d9..acc1bb95d 100644 --- a/src/paginator/paginator.component.html +++ b/src/paginator/paginator.component.html @@ -1,6 +1,12 @@
-
-
+
+
-
+
{{ intl.getTotalLabel(total) }}
-
+
- + {{ size }} {{ intl.itemsPerPageLabel }}
-
+
{{ intl.jumperLabelPrefix }} {{ intl.jumperLabelSuffix }}
-
+
diff --git a/src/paginator/paginator.component.scss b/src/paginator/paginator.component.scss index ad22cd22f..3ed98baf3 100644 --- a/src/paginator/paginator.component.scss +++ b/src/paginator/paginator.component.scss @@ -40,6 +40,7 @@ $input-width: 80px; &:first-child { display: none; } + &:last-child { display: inline; } @@ -64,6 +65,7 @@ $input-width: 80px; span + input { margin-left: use-var(spacing-m); } + input + span { margin-left: use-var(spacing-s); } @@ -75,9 +77,11 @@ $input-width: 80px; &__navigator.aui-button { background-color: use-rgb(n-8); + aui-icon { font-size: use-var(font-size-l); } + &:hover { background-color: use-rgb(p-6); } diff --git a/src/paginator/paginator.component.spec.ts b/src/paginator/paginator.component.spec.ts index f20fb7ef6..86246ab96 100644 --- a/src/paginator/paginator.component.spec.ts +++ b/src/paginator/paginator.component.spec.ts @@ -3,7 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { PaginatorComponent } from './paginator.component'; -import { PaginatorModule } from './public-api'; + +import { PaginatorModule } from '.'; describe('PaginatorComponent', () => { let fixture: ComponentFixture; diff --git a/src/paginator/paginator.module.ts b/src/paginator/paginator.module.ts index 533e52342..24b79d6de 100644 --- a/src/paginator/paginator.module.ts +++ b/src/paginator/paginator.module.ts @@ -1,10 +1,10 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ButtonModule } from '../button/public-api'; -import { IconModule } from '../icon/public-api'; -import { InputModule } from '../input/public-api'; -import { SelectModule } from '../select/public-api'; +import { ButtonModule } from '../button'; +import { IconModule } from '../icon'; +import { InputModule } from '../input'; +import { SelectModule } from '../select'; import { PAGINATOR_INTL_PROVIDER } from './paginator-intl'; import { PaginatorComponent } from './paginator.component'; diff --git a/src/paginator/public-api.ts b/src/paginator/public-api.ts deleted file mode 100644 index 17aad3072..000000000 --- a/src/paginator/public-api.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './paginator.module'; -export * from './paginator.component'; -export * from './paginator-intl'; diff --git a/src/public-api.ts b/src/public-api.ts deleted file mode 100644 index ba06c2e1d..000000000 --- a/src/public-api.ts +++ /dev/null @@ -1,38 +0,0 @@ -export * from './types'; -export * from './utils'; -export * from './table/public-api'; -export * from './sort/public-api'; -export * from './button/public-api'; -export * from './back-top/public-api'; -export * from './tooltip/public-api'; -export * from './card/public-api'; -export * from './dialog/public-api'; -export * from './icon/public-api'; -export * from './radio/public-api'; -export * from './switch/public-api'; -export * from './checkbox/public-api'; -export * from './input/public-api'; -export * from './select/public-api'; -export * from './tag/public-api'; -export * from './form/public-api'; -export * from './paginator/public-api'; -export * from './dropdown/public-api'; -export * from './inline-alert/public-api'; -export * from './breadcrumb/public-api'; -export * from './message/public-api'; -export * from './notification/public-api'; -export * from './tabs/public-api'; -export * from './tree-select/public-api'; -export * from './autocomplete/public-api'; -export * from './table-of-contents/public-api'; -export * from './status-bar/public-api'; -export * from './color-picker/public-api'; -export * from './accordion/public-api'; -export * from './scrolling/public-api'; -export * from './theme/public-api'; -export * from './anchor/public-api'; -export * from './i18n/public-api'; -export * from './time-picker/public-api'; -export * from './date-picker/public-api'; -export * from './drawer/public-api'; -export * from './steps/public-api'; diff --git a/src/radio/base-radio.ts b/src/radio/base-radio.ts index eff0aa4a9..b6368fc4d 100644 --- a/src/radio/base-radio.ts +++ b/src/radio/base-radio.ts @@ -17,7 +17,6 @@ import { RadioGroupComponent } from './radio-group/radio-group.component'; let uniqueId = 0; @Directive() -// tslint:disable-next-line: directive-class-suffix export class BaseRadio implements OnInit, AfterViewInit, OnDestroy { id = `aui-radio-${uniqueId++}`; diff --git a/src/radio/public-api.ts b/src/radio/public-api.ts deleted file mode 100644 index 64708bc70..000000000 --- a/src/radio/public-api.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './radio.component'; -export * from './radio-button/radio-button.component'; -export * from './radio-group/radio-group.component'; -export * from './radio.module'; -export * from './radio.types'; diff --git a/src/radio/radio-button/radio-button.component.html b/src/radio/radio-button/radio-button.component.html index 1cf4aaff5..8ce12a17b 100644 --- a/src/radio/radio-button/radio-button.component.html +++ b/src/radio/radio-button/radio-button.component.html @@ -1,4 +1,7 @@ -
+
-
diff --git a/src/radio/radio-group/radio-group.component.ts b/src/radio/radio-group/radio-group.component.ts index 870c6c3dc..e70bced19 100644 --- a/src/radio/radio-group/radio-group.component.ts +++ b/src/radio/radio-group/radio-group.component.ts @@ -9,7 +9,7 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { BehaviorSubject, Observable } from 'rxjs'; import { distinctUntilChanged } from 'rxjs/operators'; -import { CommonFormControl } from '../../form/public-api'; +import { CommonFormControl } from '../../form'; import { RadioSize } from '../radio.types'; @Component({ diff --git a/src/radio/radio.component.html b/src/radio/radio.component.html index 7c1aa8c98..2034a4628 100644 --- a/src/radio/radio.component.html +++ b/src/radio/radio.component.html @@ -1,4 +1,7 @@ -
+
-