Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[datetime2] feat: new package with timezone-aware components #5322

Merged
merged 60 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
fe64b6a
Add timezone aware components
vhellem May 25, 2022
e3cb6a3
Fix webkack bundle issue
vhellem May 25, 2022
e1c9d9c
Clear up some references
vhellem May 25, 2022
e21ac2d
Update docs
vhellem May 25, 2022
529bcee
Fix example of time zone aware date input
vhellem May 25, 2022
49bdb9a
Add utils test
vhellem May 25, 2022
90516bb
Fix css in examples
vhellem May 25, 2022
84bce24
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya May 25, 2022
15f1067
Fix lockfile URLs
adidahiya May 25, 2022
8264cdf
dedupe lockfile
adidahiya May 25, 2022
656f901
Fix formatting
adidahiya May 25, 2022
f3195ae
fix lint
adidahiya May 25, 2022
f26685f
fix compilation
adidahiya May 25, 2022
5aaf994
bump CI cache key, add missing dependency to new package
adidahiya May 25, 2022
8caab8d
Performance benefits
vhellem May 26, 2022
8479b48
Add timezone picker test
vhellem May 26, 2022
bbb7202
Add iso test and import tests
vhellem May 26, 2022
22a2ac4
Fix tests
vhellem May 26, 2022
fb76985
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya May 26, 2022
ea0a68c
fix lint
vhellem May 26, 2022
cadb53d
Add timezone aware date input test
vhellem May 30, 2022
f60c13d
Fix props references
vhellem May 30, 2022
8d079e7
Merge branch 'develop' into vh/timezone-aware-date-input
vhellem Jun 1, 2022
7e44fb0
migrate to Select2
adidahiya Jun 1, 2022
0a8484f
Standardize 'timezone' name instead of 'timeZone'
adidahiya Jun 1, 2022
eda9fb7
remove google chrome binary
adidahiya Jun 1, 2022
d41a0f2
Apply suggestions from code review
vhellem Jun 2, 2022
828262d
Apply other suggestions
vhellem Jun 2, 2022
63957ea
Fix issue with show local timezone already being in minimal timezone …
vhellem Jun 2, 2022
421e245
Address comments
vhellem Jun 2, 2022
84875fe
Fix wrong props reference
vhellem Jun 2, 2022
63c0725
Fix: Bad references in timezone picker docs
vhellem Jun 2, 2022
6ae767f
Remove unused types
vhellem Jun 2, 2022
5628952
Add more examples state changesto dateinput2
vhellem Jun 2, 2022
2a9bba1
Force controlled time
vhellem Jun 2, 2022
99de01e
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya Jun 2, 2022
49625a2
fix lint
adidahiya Jun 2, 2022
26af68a
fix iso test
adidahiya Jun 2, 2022
7d587e2
Change how timezone picker target is rendered
vhellem Jun 2, 2022
1a9f17b
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya Jun 3, 2022
5aa1e3b
Fix test imports
vhellem Jun 3, 2022
777195f
Disabled input should disable time zone selecter
vhellem Jun 3, 2022
ab3d05a
Disabled timezone picker should not look interactive
vhellem Jun 3, 2022
79ae1aa
make timezone target unselectable
vhellem Jun 3, 2022
0ba7b97
Some last improvements
vhellem Jun 3, 2022
0bd371a
Fix most tests
vhellem Jun 3, 2022
4bf950b
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya Jun 3, 2022
effd7a7
fix lint
adidahiya Jun 3, 2022
4e9af2d
Merge remote-tracking branch 'origin/develop' into vh/timezone-aware-…
adidahiya Jun 7, 2022
fd23e4b
fix example width, add fill prop
adidahiya Jun 7, 2022
c011352
Fix file names, improve docs
adidahiya Jun 8, 2022
e67e6a5
fix test and lint
adidahiya Jun 8, 2022
ca5b57b
fix/improve docs nav sidebar for new packages
adidahiya Jun 8, 2022
0c32b21
TimezonePicker2 -> TimezoneSelect
adidahiya Jun 8, 2022
39e43b8
run new package tests in CI
adidahiya Jun 8, 2022
f115d5d
fix test suite
adidahiya Jun 8, 2022
7c0fb87
renames/refactors for code style; apply strict null checks
adidahiya Jun 9, 2022
7359b3f
fix version number to 0.x range
adidahiya Jun 9, 2022
85d4c85
add migration callouts to docs
adidahiya Jun 9, 2022
3d7130c
Fix version dep
adidahiya Jun 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ aliases:

- &restore-node-modules-cache
name: Restore node_modules cache
key: v4-yarn-deps-{{ checksum "yarn.lock" }}
key: v5-yarn-deps-{{ checksum "yarn.lock" }}

- &restore-yarn-cache
name: Restore yarnpkg cache
key: v4-yarn-cache
key: v5-yarn-cache

- &save-node-modules-cache
name: Save node_modules cache
paths:
- node_modules
key: v4-yarn-deps-{{ checksum "yarn.lock" }}
key: v5-yarn-deps-{{ checksum "yarn.lock" }}

- &save-yarn-cache
name: Save yarnpkg cache
paths:
- ~/.cache/yarn
key: v4-yarn-cache
key: v5-yarn-cache

references:
reports_path: &reports_path
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
environment:
JUNIT_REPORT_PATH: reports
NODE_ENV: test
parallelism: 7
parallelism: 8
steps:
- checkout
- restore_cache: *restore-node-modules-cache
Expand All @@ -160,10 +160,11 @@ jobs:
0) yarn lerna run --parallel test:typeCheck ;; \
1) yarn lerna run --scope "@blueprintjs/core" test:karma ;; \
2) yarn lerna run --scope "@blueprintjs/datetime" test:karma ;; \
3) yarn lerna run --scope "@blueprintjs/popover2" test:karma ;; \
4) yarn lerna run --scope "@blueprintjs/select" test:karma ;; \
5) yarn lerna run --scope "@blueprintjs/table" test:karma ;; \
6) yarn lerna run --scope "@blueprintjs/timezone" test:karma ;; \
3) yarn lerna run --scope "@blueprintjs/datetime2" test:karma ;; \
4) yarn lerna run --scope "@blueprintjs/popover2" test:karma ;; \
5) yarn lerna run --scope "@blueprintjs/select" test:karma ;; \
6) yarn lerna run --scope "@blueprintjs/table" test:karma ;; \
7) yarn lerna run --scope "@blueprintjs/timezone" test:karma ;; \
esac
when: always
- store_test_results: { path: ./reports }
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
"dev:core": "lerna run dev --parallel --scope \"@blueprintjs/{core,icons,docs-app}\"",
"dev:docs": "lerna run dev --parallel --scope \"@blueprintjs/{core,docs-app,docs-theme}\"",
"dev:datetime": "lerna run dev --parallel --scope \"@blueprintjs/{datetime,timezone,docs-app}\"",
"dev:datetime2": "lerna run dev --parallel --scope \"@blueprintjs/{datetime2,docs-app}\"",
"dev:popover2": "lerna run dev --parallel --scope \"@blueprintjs/{popover2,docs-app}\"",
"dev:select": "lerna run dev --parallel --scope \"@blueprintjs/{select,docs-app}\"",
"dev:table": "lerna run dev --parallel --scope \"@blueprintjs/{table,table-dev-app}\"",
"dist": "run-s dist:libs dist:apps",
"dist:libs": "lerna run dist --parallel --scope \"@blueprintjs/{colors,core,datetime,docs-theme,icons,popover2,select,table,timezone}\"",
"dist:libs": "lerna run dist --parallel --scope \"@blueprintjs/{colors,core,datetime,datetime2, docs-theme,icons,popover2,select,table,timezone}\"",
"dist:apps": "lerna run dist --parallel --scope \"@blueprintjs/{docs-app,landing-app,table-dev-app,demo-app}\"",
"docs-data": "lerna run compile --scope \"@blueprintjs/docs-data\"",
"format": "prettier --write \"./**/*.{ts,tsx,json}\"",
Expand Down
7 changes: 7 additions & 0 deletions packages/datetime/src/_datepicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ $header-margin: ($header-height - $pt-input-height) * 0.5 !default;
padding-left: $datepicker-padding;
}

.#{$ns}-datepicker-content {
align-items: center;
display: flex;
flex-direction: column;
gap: 5px;
}

.#{$ns}-datepicker-footer {
display: flex;
justify-content: space-between;
Expand Down
1 change: 1 addition & 0 deletions packages/datetime/src/common/classes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const DATEPICKER_CAPTION = `${DATEPICKER}-caption`;
export const DATEPICKER_CAPTION_CARET = `${DATEPICKER_CAPTION}-caret`;
export const DATEPICKER_CAPTION_MEASURE = `${DATEPICKER_CAPTION}-measure`;
export const DATEPICKER_CAPTION_SELECT = `${DATEPICKER_CAPTION}-select`;
export const DATEPICKER_CONTENT = `${DATEPICKER}-content`;
export const DATEPICKER_DAY = "DayPicker-Day";
export const DATEPICKER_DAY_DISABLED = `${DATEPICKER_DAY}--disabled`;
export const DATEPICKER_DAY_OUTSIDE = `${DATEPICKER_DAY}--outside`;
Expand Down
6 changes: 4 additions & 2 deletions packages/datetime/src/datePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,14 @@ export class DatePicker extends AbstractPureComponent2<DatePickerProps, IDatePic
}

public render() {
const { className, dayPickerProps, locale, localeUtils, maxDate, minDate, showActionsBar } = this.props;
const { className, dayPickerProps, footerElement, locale, localeUtils, maxDate, minDate, showActionsBar } =
this.props;
const { displayMonth, displayYear } = this.state;

return (
<div className={classNames(Classes.DATEPICKER, className)}>
{this.maybeRenderShortcuts()}
<div>
<div className={Classes.DATEPICKER_CONTENT}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note to self: consider a different name for this class, like "datepicker main panel" or something

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to update it myself as well?

<DayPicker
showOutsideDays={true}
locale={locale}
Expand All @@ -170,6 +171,7 @@ export class DatePicker extends AbstractPureComponent2<DatePickerProps, IDatePic
/>
{this.maybeRenderTimePicker()}
{showActionsBar && this.renderOptionsBar()}
{footerElement}
</div>
</div>
);
Expand Down
5 changes: 5 additions & 0 deletions packages/datetime/src/datePickerCore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ export interface IDatePickerBaseProps {
*/
dayPickerProps?: DayPickerProps;

/**
* An additional element to show below the date picker
*/
footerElement?: JSX.Element;

/**
* Whether the current day should be highlighted in the calendar.
*
Expand Down
23 changes: 17 additions & 6 deletions packages/datetime/src/dateinput.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
@# Date input

The `DateInput` component is an [input group](#core/components/text-inputs.input-group)
that shows a [`DatePicker`](#datetime/datepicker) in a [`Popover`](#core/components/popover)
<div class="@ns-callout @ns-intent-success @ns-icon-star">
<h4 class="@ns-heading">Newer API available</h4>

There is an updated version of this component available in the new
[__@blueprintjs/datetime2__ package](#datetime2) called
[DateInput2](#datetime2/date-input2). Its API is currently in development,
but you are encouraged to try it out and provide feedback for the next
version of the Blueprint date input.

</div>

The DateInput component is an [InputGroup](#core/components/text-inputs.input-group)
that shows a [DatePicker](#datetime/datepicker) in a [Popover](#core/components/popover)
on focus. Use it in forms where the user must enter a date.

@reactExample DateInputExample
Expand All @@ -18,9 +29,9 @@ The optional `locale` argument is the value of the `locale` prop.
A simple implementation using built-in browser methods could look like this:

```tsx
import { DateInput, IDateFormatProps } from "@blueprintjs/datetime";
import { DateInput, DateFormatProps } from "@blueprintjs/datetime";

const jsDateFormatter: IDateFormatProps = {
const jsDateFormatter: DateFormatProps = {
// note that the native implementation of Date functions differs between browsers
formatDate: date => date.toLocaleDateString(),
parseDate: str => new Date(str),
Expand All @@ -33,10 +44,10 @@ const jsDateFormatter: IDateFormatProps = {
An implementation using `moment.js` could look like this:

```tsx
import { DateInput, IDateFormatProps } from "@blueprintjs/datetime";
import { DateInput, DateFormatProps } from "@blueprintjs/datetime";
import moment from "moment";

function getMomentFormatter(format: string): IDateFormatProps {
function getMomentFormatter(format: string): DateFormatProps {
// note that locale argument comes from locale prop and may be undefined
return {
formatDate: (date, locale) => moment(date).locale(locale).format(format),
Expand Down
2 changes: 1 addition & 1 deletion packages/datetime/test/isotest.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

require("@blueprintjs/test-commons/bootstrap");
const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
const React = require("react");

const DateTime = require("../lib/cjs");

describe("DateTime isomorphic rendering", () => {
Expand Down
5 changes: 5 additions & 0 deletions packages/datetime2/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
coverage/
test/
webpack.config.js
karma.conf.js
.npmrc
176 changes: 176 additions & 0 deletions packages/datetime2/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS
31 changes: 31 additions & 0 deletions packages/datetime2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<img height="204" src="https://cloud.githubusercontent.com/assets/464822/20228152/d3f36dc2-a804-11e6-80ff-51ada2d13ea7.png">

# [Blueprint](http://blueprintjs.com/) Date & Time Components (V2)

Blueprint is a React UI toolkit for the web.

This package contains a collection of React components for working with dates
and times. These are modern variants of the components available in the
`@blueprintjs/datetime` package; they will become the standard date & time
components in a future major version of Blueprint.

Compared to their "V1" counterparts, these components:
- use Popover2 instead of Popover under the hood
- have better timezone awareness
- utilize lightweight dependencies for manipulating dates and displaying
the list of available timezones
- no longer use the deprecated moment.js library

At the moment, `@blueprintjs/datetime` is a dependency of this
package, as it delegates to the `<DatePicker>` and `<DateRangePicker>`
implementation exported from there. When these "V2" components graduate
to become the standard API, all Blueprint date/time components will
be collected into a single package, `@blueprintjs/datetime@5.x`.

## Installation

```
npm install --save @blueprintjs/datetime2
```

### [Full Documentation](http://blueprintjs.com/docs) | [Source Code](https://github.com/palantir/blueprint)
Loading