Skip to content

Commit

Permalink
Merge branch 'release/14.0.0' into feat/is-on-background
Browse files Browse the repository at this point in the history
  • Loading branch information
mtorres3 authored Oct 25, 2023
2 parents c704a74 + 75c2382 commit 341673d
Show file tree
Hide file tree
Showing 46 changed files with 2,751 additions and 482 deletions.
18 changes: 18 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,24 @@
"bug",
"code"
]
},
{
"login": "henryclong",
"name": "Henry Long",
"avatar_url": "https://avatars.githubusercontent.com/u/52258386?v=4",
"profile": "https://github.com/henryclong",
"contributions": [
"code"
]
},
{
"login": "sirrah-tam",
"name": "Mat Harris",
"avatar_url": "https://avatars.githubusercontent.com/u/6874453?v=4",
"profile": "https://matharris.dev/",
"contributions": [
"a11y"
]
}
],
"contributorsPerLine": 7
Expand Down
5 changes: 5 additions & 0 deletions .changeset/five-moles-add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@ithaka/pharos': major
---

Remove `paint` value of contain property globally
6 changes: 6 additions & 0 deletions .storybook/initComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
PharosButton,
PharosCheckbox,
PharosCheckboxGroup,
PharosCoachMark,
PharosCombobox,
PharosDropdownMenu,
PharosDropdownMenuItem,
Expand All @@ -22,10 +23,12 @@ import {
PharosLoadingSpinner,
PharosModal,
PharosPagination,
PharosPopover,
PharosProgressBar,
PharosRadioButton,
PharosRadioGroup,
PharosSelect,
PharosSheet,
PharosSidenav,
PharosSidenavButton,
PharosSidenavLink,
Expand All @@ -52,6 +55,7 @@ registerComponents('storybook', [
PharosButton,
PharosCheckbox,
PharosCheckboxGroup,
PharosCoachMark,
PharosCombobox,
PharosDropdownMenu,
PharosDropdownMenuItem,
Expand All @@ -69,10 +73,12 @@ registerComponents('storybook', [
PharosLoadingSpinner,
PharosModal,
PharosPagination,
PharosPopover,
PharosProgressBar,
PharosRadioButton,
PharosRadioGroup,
PharosSelect,
PharosSheet,
PharosSidenav,
PharosSidenavButton,
PharosSidenavLink,
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HassanTanveer"><img src="https://avatars.githubusercontent.com/u/57575219?v=4?s=100" width="100px;" alt="Hassan Tanveer"/><br /><sub><b>Hassan Tanveer</b></sub></a><br /><a href="https://github.com/ithaka/pharos/commits?author=HassanTanveer" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mariadevadoss"><img src="https://avatars.githubusercontent.com/u/132926833?v=4?s=100" width="100px;" alt="mariadevadoss"/><br /><sub><b>mariadevadoss</b></sub></a><br /><a href="https://github.com/ithaka/pharos/commits?author=mariadevadoss" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://brentswisher.com/"><img src="https://avatars.githubusercontent.com/u/6653970?v=4?s=100" width="100px;" alt="Brent Swisher"/><br /><sub><b>Brent Swisher</b></sub></a><br /><a href="https://github.com/ithaka/pharos/issues?q=author%3Abrentswisher" title="Bug reports">🐛</a> <a href="https://github.com/ithaka/pharos/commits?author=brentswisher" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/henryclong"><img src="https://avatars.githubusercontent.com/u/52258386?v=4?s=100" width="100px;" alt="Henry Long"/><br /><sub><b>Henry Long</b></sub></a><br /><a href="https://github.com/ithaka/pharos/commits?author=henryclong" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://matharris.dev/"><img src="https://avatars.githubusercontent.com/u/6874453?v=4?s=100" width="100px;" alt="Mat Harris"/><br /><sub><b>Mat Harris</b></sub></a><br /><a href="#a11y-sirrah-tam" title="Accessibility">️️️️♿️</a></td>
</tr>
</tbody>
</table>
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-standard-scss": "^10.0.0",
"stylelint-scss": "^5.0.1",
"svglint": "^2.2.0",
"svglint": "^2.4.0",
"vite": "^4.3.9"
},
"workspaces": {
Expand All @@ -131,17 +131,16 @@
"resolutions": {
"@typescript-eslint/parser": "^5.41.0",
"axe-core": "^4.3.3",
"playwright": "^1.17.1",
"ansi-regex": "^5.0.1",
"nth-check": "^2.0.1",
"semver-regex": "^3.1.3",
"immer": "^9.0.6",
"object-path": "^0.11.8",
"glob-parent": "^6.0.2",
"browserslist": "^4.16.5",
"trim": "^0.0.3",
"marked": "^0.7.0",
"graphql-config": "^4.1.0"
"loader-utils": "^2.0.3",
"marked": "^4.0.10",
"json5": "^2.2.2"
},
"size-limit": [
{
Expand Down
7 changes: 7 additions & 0 deletions packages/pharos-site/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @ithaka/pharos-site

## 5.13.4

### Patch Changes

- Updated dependencies [[`d67125a`](https://github.com/ithaka/pharos/commit/d67125a4a9598475aff9000b18567f734074915f)]:
- @ithaka/pharos@13.0.0

## 5.13.3

### Patch Changes
Expand Down
1 change: 1 addition & 0 deletions packages/pharos-site/initComponents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ if (typeof window !== `undefined`) {
pharos.PharosButton,
pharos.PharosCheckbox,
pharos.PharosCheckboxGroup,
pharos.PharosCoachMark,
pharos.PharosCombobox,
pharos.PharosDropdownMenu,
pharos.PharosDropdownMenuItem,
Expand Down
4 changes: 2 additions & 2 deletions packages/pharos-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"access": "public"
},
"description": "Pharos acts as a guiding light to helps us create consistent, dependable and focused experiences for all of JSTOR users.",
"version": "5.13.3",
"version": "5.13.4",
"dependencies": {
"@ithaka/pharos": "^12.20.0",
"@ithaka/pharos": "^13.0.0",
"@mdx-js/mdx": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@webcomponents/scoped-custom-element-registry": "^0.0.3",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Intro from '@guidelines/coach-mark.docs';

<Intro />
153 changes: 153 additions & 0 deletions packages/pharos-site/static/guidelines/coach-mark.docs.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
import PageSection from '@components/statics/PageSection.tsx';
import BestPractices from '@components/statics/BestPractices.tsx';

<PageSection
title="Coach Mark"
description="Coach marks highlight new or unique features, direct users in the right direction, or guide users during onboarding."
isHeader
storyBookType="forms"
></PageSection>

## Examples

```jsx live
<>
<div
style={{
border: '1px solid #eae8e1',
padding: '20px',
margin: '200px auto',
width: 'fit-content',
}}
data-coach-mark="example-coachmark"
>
Lorem Ipsum
</div>
<PharosCoachMark
id="example-coachmark"
hide="false"
side="bottom"
alignment="start"
header="Coach Mark"
delay="short"
variant="light"
>
This is an example Coach Mark
</PharosCoachMark>
</>
```

<PageSection
topMargin
title="Usage"
description="Coach marks can appear automatically, after a delay, to focus the user's attention on a single primary action or in response to an action."
>
<PageSection title="Examples" subSectionLevel={1}>
<ul>
<li>When a user visits a page for the first time</li>
<li>When a new feature is added</li>
<li>Inform a user after they activated a process</li>
</ul>
</PageSection>
<PageSection title="Placement" subSectionLevel={1}>
<p>
There are 12 placement options available. Coach marks can be placed top, bottom, left or right
of the target (e.g. button, icon, link, etc.) and the caret (triangle) can be placed at the
start, center or end of the coach mark.
</p>
<p>
<strong>Where should I place a coach mark? </strong>
</p>
<p>
The coach mark should be in close proximity to the feature that it highlights. There are 2
preferred placement options out of a total of the available 12. A coachmark should be placed
either on the top or bottom of a feature with the caret (triangle) appearing in the center.
The other placement options should only be used so that important features or information is
not hidden.
</p>
</PageSection>
<PageSection title="Types" subSectionLevel={1}>
<ol>
<li>
Informational: Focuses the attention of the user on a section of the page or process taking
place.
</li>
<li>Instructional: Highlights a feature or action.</li>
</ol>
</PageSection>
<PageSection title="Light vs Dark" subSectionLevel={1}>
<p>
The dark coach mark variant is the default state. Most of the backgrounds on JSTOR are white
and should use the dark coach mark for contrast. Consider using the light coach mark variant
when the coach mark will appear over dark backgrounds.
</p>
</PageSection>
</PageSection>
<PageSection title="Best practices">
<BestPractices
Do={
<ul>
<li>
Use coach marks to focus attention to important functionality and feedback in context
</li>
<li>Display coach marks on a page once per session</li>
<li>Checkboxes should always include a label</li>
<li>
Consider a coach mark to promote new features, functionality, or other changes to layout
and patterns that may disorient the user
</li>
</ul>
}
Dont={
<ul>
<li>
Do not repetitively display the same coach mark. You should be able to track whether the
user has dismissed the coach mark and be confident it will not reappear
</li>
<li>
Do not overuse the coach mark and consider where else in the user's journey they may be
interacting with coach marks within the product
</li>
<li>
Do not add more than one coach mark to a page. If features need explanation consider a
tool tip or other passive communication devices (badges, external links, etc)
</li>
</ul>
}
/>
</PageSection>
<PageSection title="Content guidelines">
<p>
The coach mark headline and body copy should be informative, actionable, and concise. It should
Include the minimum amount of information that users need to know. It should not repeat what is
already visibly available to the user in the interface. For example, you should not use
"Workspace" as a headline if the coach mark is targeting a "Workspace" navigation link. Rather
you would expect something actionable like.. "Find what you saved". Content should be written in
sentence case. Refer to{' '}
<PharosLink href="https://pharos.jstor.org/content-style-guide/voice-and-tone">
Voice and Tone guidelines
</PharosLink>{' '}
for more guidance.
</p>
</PageSection>
<PageSection title="Accessibility">
<PageSection subSectionLevel={1} title="Relevant WCAG guidelines">
<ul>
<li>
<PharosLink href="https://www.w3.org/WAI/WCAG21/Understanding/status-messages.html">
4.1.3 Status Messages
</PharosLink>
</li>
<li>
<PharosLink href="https://www.w3.org/WAI/WCAG21/Understanding/info-and-relationships.html">
1.3.1 Info and Relationships A
</PharosLink>
</li>
</ul>
</PageSection>
<PageSection subSectionLevel={1} title="Code expectations">
<ul>
<li>Button contains "aria-haspopup="dialog"</li>
</ul>
</PageSection>
</PageSection>
44 changes: 44 additions & 0 deletions packages/pharos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,49 @@
# @ithaka/pharos

## 13.0.0

### Major Changes

- [#608](https://github.com/ithaka/pharos/pull/608) [`d67125a`](https://github.com/ithaka/pharos/commit/d67125a4a9598475aff9000b18567f734074915f) Thanks [@henryclong](https://github.com/henryclong)! - Adds the coach mark component, which is used to highlight new or unique features

## 12.26.2

### Patch Changes

- [#617](https://github.com/ithaka/pharos/pull/617) [`6ec2d69`](https://github.com/ithaka/pharos/commit/6ec2d695f4fcaefc46616f7e582d9e71f641a4f6) Thanks [@jialin-he](https://github.com/jialin-he)! - Update default height to sheet and emit events

## 12.26.1

### Patch Changes

- [#613](https://github.com/ithaka/pharos/pull/613) [`ef13fa1`](https://github.com/ithaka/pharos/commit/ef13fa18638f630f55716c60d81c9ba8d23c255d) Thanks [@jialin-he](https://github.com/jialin-he)! - Add overflow to sheet

## 12.26.0

### Minor Changes

- [#603](https://github.com/ithaka/pharos/pull/603) [`5d15316`](https://github.com/ithaka/pharos/commit/5d15316632da788f692ec731a2aae765e6785c21) Thanks [@michael-iden](https://github.com/michael-iden)! - Add sheet component

### Patch Changes

- [#610](https://github.com/ithaka/pharos/pull/610) [`d762a02`](https://github.com/ithaka/pharos/commit/d762a0294cd940970c8bbaff8c97aae7e9bdae82) Thanks [@michael-iden](https://github.com/michael-iden)! - Force popover border radius styling

- [#599](https://github.com/ithaka/pharos/pull/599) [`834f7ab`](https://github.com/ithaka/pharos/commit/834f7ab8976f194bc641db244671338e7f7ab023) Thanks [@jialin-he](https://github.com/jialin-he)! - Add line rules to light variant of dropdown

- [#606](https://github.com/ithaka/pharos/pull/606) [`e020300`](https://github.com/ithaka/pharos/commit/e02030087baffbc9685f39f1f77725d1ba5e10bc) Thanks [@daneah](https://github.com/daneah)! - Increase color contrast for glacier blue 40

## 12.25.0

### Minor Changes

- [#596](https://github.com/ithaka/pharos/pull/596) [`8c223fa`](https://github.com/ithaka/pharos/commit/8c223faf6c189e46bc4a8fc9291310947a5d04ba) Thanks [@michael-iden](https://github.com/michael-iden)! - Add compare and side-panel icons

## 12.24.0

### Minor Changes

- [#588](https://github.com/ithaka/pharos/pull/588) [`130ce55`](https://github.com/ithaka/pharos/commit/130ce553ddc7a16343ef934629e0ecd51f617267) Thanks [@michael-iden](https://github.com/michael-iden)! - added popover component

## 12.23.0

### Minor Changes
Expand Down
2 changes: 2 additions & 0 deletions packages/pharos/assets/icons/compare.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/pharos/assets/icons/side-panel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/pharos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"publishConfig": {
"access": "public"
},
"version": "12.23.0",
"version": "13.0.0",
"description": "Pharos web components for products and experiences",
"files": [
"lib",
Expand Down Expand Up @@ -84,7 +84,7 @@
"react-dom": "^17.0.1",
"replace-in-file": "^6.3.2",
"rimraf": "^3.0.2",
"sassdoc": "^2.7.3",
"sassdoc": "^2.7.4",
"sinon": "^12.0.1",
"style-dictionary": "^3.0.1",
"ts-lit-plugin": "^1.2.1",
Expand Down
Loading

0 comments on commit 341673d

Please sign in to comment.