Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Merge master into feat/tabs/tabs #3096

Merged
merged 259 commits into from
Jul 16, 2018

Conversation

patrickrodee
Copy link
Contributor

@patrickrodee patrickrodee commented Jul 16, 2018

Merge the origin/master branch into feat/tabs/tabs, bringing it up-to-date with the current state of the repo. There will be a follow-up PR that includes updates to Tab, Tab Indicator, and Tab Scroller to account for the updates to Tab, Tab Indicator, and Tab Scroller's dependencies.

kfranqueiro and others added 30 commits April 18, 2018 09:24
The adapter layout API is no longer used and can be removed.
Add new on-primary and on-secondary colors. 
BREAKING CHANGE: Removes the --mdc-theme-text-<TEXT_STYLE>-on-<THEME_COLOR> CSS custom properties, and the mdc-theme--text-<TEXT_STYLE>-on-<THEME_COLOR> CSS classes
Adds new variables, properties and classes for "surface" and "on-surface" colors. Refer to the documentation for information and examples.
BREAKING CHANGE: Adds removeAttr(attr) adapter API
BREAKING CHANGE: Removes the (undocumented) mdc-floating-label-transition function
Update typography and colors to match guidance.
Multi-line `/* ... */` comments get emitted verbatim in the CSS output,
whereas single-line `//` comments do not.

To test, run `npm run build` and compare
`build/material-components-web.css` against the same file generated by
`master`.

You'll notice a bunch of seemingly random orphaned CSS comments are no
longer emitted.
BREAKING CHANGE: Add API for remove icon including mdc-chip__icon--remove, remove() method and adapter methods to MDCChip. Modify appendChip() and add removeChip() adapter method to MDCChipSet.
…adding. (#2606)

Adjusted the typography style to use subtitle1. Adjusted the height and padding to accommodate the larger line-height on subtitle1.
…#2600)

BREAKING CHANGE: Adds getAttr adapter API to text field icon
BREAKING CHANGE: Get rid of mdc-chip__icon--remove API.
BREAKING CHANGE: Add Sass mixins to customize color and size of leading/trailing icons.
BREAKING CHANGE: Entry chips renamed to input chips.
acdvorak and others added 14 commits July 14, 2018 02:29
### What it does

- Runs the full suite of screenshot tests in Travis for every PR
    - Takes about 4.5 minutes to run (half of that is due to `npm install`)
- Adds an encrypted GCS credentials file to the repo for Travis
- Displays PR number on the report page of Travis runs

### Example output

Report page:

- https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/07/14/13_17_35_443/report/report.html

![report-page-screenshot-pr](https://user-images.githubusercontent.com/409245/42724825-02321a58-872e-11e8-99dd-90f193bf742c.png)
If a PR only contains files in `demos/`, `docs/`, `test/unit/`, and/or `*.md`, screenshot tests will not be run
### How to test

```bash
npm run screenshot:test -- --offline --retries=0
```
…ub PRs (#3080)

### What it does

- Posts screenshot test statuses and diff report links on every PR
    - The "Details" link takes you to the Travis CI job A) while the test is running, and B) when it fails with an error
    - The "Details" link takes you to the report page when the screenshot test completes
    - Uses the [GItHub commit status API](https://developer.github.com/v3/repos/statuses/) and a bot account: @mdc-web-bot 
- Adds an encrypted credential file for the GitHub API
- Adds color and collapsible sections to Travis CI log output to make it easier to read

Notes:

- Travis CI screenshot tests currently diff against the PR's `golden.json` file, so the tests will pass if the browsers render what the PR says they do. It's still up to the PR author and reviewer to diff against `origin/master`'s `golden.json` and make sure the _change_ makes sense.
- We should create a follow up PR that links to a diff against `master`'s `golden.json` instead.

### How to test it

1. Create a PR that modifies a file in `packages/` or `test/screenshot/` (such as this one).
2. Scroll to the bottom of the PR in GItHub.
3. **After about 2 minutes**, a `screenshot-test/butter-bot` status should appear - _like magic_.

### Example output

#### Pending - Running screenshot tests:

![01 - pending](https://user-images.githubusercontent.com/409245/42746200-7d268222-888b-11e8-950c-fabac9c2a4f1.png)

#### Passed - No diffs:

* [Travis job](https://travis-ci.org/material-components/material-components-web/jobs/404316948)
* [Diff report](https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/07/16/06_28_03_366/report/report.html)

![02 - passed](https://user-images.githubusercontent.com/409245/42746214-8c44b38c-888b-11e8-99cc-a60ad84c36cc.png)

#### Failed - 4 Diffs found:

* [Travis job](https://travis-ci.org/material-components/material-components-web/builds/404308287)
* [Diff report](https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/07/16/05_54_55_095/report/report.html)

![03 - failed](https://user-images.githubusercontent.com/409245/42746226-a26afd9c-888b-11e8-8d50-59d338f1c0f4.png)

#### Full page:

![image](https://user-images.githubusercontent.com/409245/42746995-4b54db96-888f-11e8-9e72-974a80efe477.png)
)

The `npm run screenshot:serve` command was recently broken by a refactoring. It would immediately exit instead of waiting to be killed by the user. That is now fixed.
- Remove "Opera". We don't test in it, and it uses the same rendering engine as Chrome (Blink)
- Reorganize list into a map of browsers to OSes (I find it easier to read)
…3092)

PRs have a separate "status check" for screenshot diffs in the GitHub UI, so we don't want to fail the Travis job if a PR has diffs.

However, once the PR has been merged into `master`, we absolutely _should_ fail the Travis job if there are any diffs.
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

abhiomkar and others added 3 commits July 16, 2018 17:22
Adds a single selection feature to the list with accessibility support.
@patrickrodee
Copy link
Contributor Author

Blocked by #3098

@codecov-io
Copy link

codecov-io commented Jul 16, 2018

Codecov Report

Merging #3096 into feat/tabs/tabs will decrease coverage by 0.41%.
The diff coverage is 97.07%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           feat/tabs/tabs    #3096      +/-   ##
==================================================
- Coverage           98.83%   98.41%   -0.42%     
==================================================
  Files                 110      113       +3     
  Lines                4534     4790     +256     
  Branches              548      600      +52     
==================================================
+ Hits                 4481     4714     +233     
- Misses                 53       76      +23
Impacted Files Coverage Δ
packages/mdc-line-ripple/index.js 100% <ø> (ø) ⬆️
packages/mdc-selection-control/index.js 0% <ø> (ø) ⬆️
packages/mdc-chips/chip/constants.js 100% <ø> (ø) ⬆️
packages/mdc-textfield/icon/constants.js 100% <ø> (ø) ⬆️
packages/mdc-line-ripple/foundation.js 100% <ø> (ø) ⬆️
packages/mdc-ripple/util.js 100% <ø> (ø) ⬆️
packages/mdc-dialog/index.js 100% <ø> (ø) ⬆️
packages/mdc-ripple/index.js 100% <ø> (ø) ⬆️
packages/mdc-icon-button/constants.js 100% <100%> (ø)
packages/mdc-checkbox/foundation.js 97.63% <100%> (+0.05%) ⬆️
... and 35 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c9cba62...92e3358. Read the comment docs.

@patrickrodee patrickrodee merged commit d82c162 into feat/tabs/tabs Jul 16, 2018
kfranqueiro pushed a commit that referenced this pull request Jul 27, 2018
WIP fixed bg coloring of icons

fix(tab-indicator): Use absolute positioning (#2547)

WIP start of tab scroller

WIP fixed transition duration

WIP progress on scroller

WIP added demos back

chore(tabs): Removed tab scroller

feat(tabs): Add tab indicator inside tab (#2565)

feat(tab-scroller): Add tab scroller (#2577)

Merge master into feat/tabs/tabs (#3096)

feat(tab): Update tab color and typography (#3108)

docs(tabs): Update metadata and synopses (#3117)

feat(tab): Add MDCTabDimensions computation (#3122)

feat(tab): Emit selection and activation events (#3139)

docs(tabs): Update new READMEs to match standard (#3142)

feat(tab): Give focus to tab when activated (#3164)

feat(tab): Add mixin for parent positioning; Use mixin in tab scroller (#3179)

fix(tabs): Suppress area occupied by scrollbar on platforms that show it (#3149)

fix(tab): Remove extraneous padding from the stacked text label in LTR (#3193)

feat(tabs): Add missing docs and create helper util API (#3194)

Merge master into feat/tabs/tabs (#3227)

feat(tab): Update layout; Add fixed-width mixin; Add min-width class (#3220)

fix(tab-scroller): Fix incorrect animation stopping scroll value in RTL (#3237)

feat(tab-scroller): Add scroll content width method for use in tab bar (#3222)

feat(tab): Remove activation event emitting (#3242)

feat(tab-bar): Add tab bar (#3229)
@kfranqueiro kfranqueiro deleted the feat/tabs/tabs-merge-master1 branch August 1, 2018 16:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.