-
Notifications
You must be signed in to change notification settings - Fork 13.5k
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
feat(ion-datetime): add hidden-days when theme:ionic #30205
Draft
JoaoFerreira-FrontEnd
wants to merge
1
commit into
next
Choose a base branch
from
ROU-11118
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -102,8 +102,15 @@ export const getDaysOfWeek = (locale: string, theme: Theme, firstDayOfWeek = 0) | |
* the firstDayOfWeek value (Sunday by default) | ||
* using null values. | ||
*/ | ||
export const getDaysOfMonth = (month: number, year: number, firstDayOfWeek: number) => { | ||
export const getDaysOfMonth = (month: number, year: number, firstDayOfWeek: number, displayHiddenDays = false) => { | ||
const numDays = getNumDaysInMonth(month, year); | ||
let previousNumDays: number; //previous month number of days | ||
if (month === 1) { //If january the previous month should be january and the last year | ||
previousNumDays = getNumDaysInMonth(12, year-1); | ||
} else { //If not the previous month should be month -1 and the current year | ||
previousNumDays = getNumDaysInMonth(month - 1, year); | ||
} | ||
|
||
const firstOfMonth = new Date(`${month}/1/${year}`).getDay(); | ||
|
||
/** | ||
|
@@ -127,14 +134,38 @@ export const getDaysOfMonth = (month: number, year: number, firstDayOfWeek: numb | |
*/ | ||
const offset = | ||
firstOfMonth >= firstDayOfWeek ? firstOfMonth - (firstDayOfWeek + 1) : 6 - (firstDayOfWeek - firstOfMonth); | ||
let days: ({ | ||
day: number; | ||
dayOfWeek: number; | ||
hiddenDay: boolean; | ||
} | { | ||
day: null; | ||
dayOfWeek: null; | ||
hiddenDay: boolean; | ||
})[] = []; | ||
for (let i = 1; i <= numDays; i++) { | ||
days.push({ day: i, dayOfWeek: (offset + i) % 7, hiddenDay: false }); | ||
} | ||
|
||
if (displayHiddenDays) { | ||
for (let i = 0; i <= offset; i++) { | ||
// Using offset create previous month hidden day, starting from last day | ||
days = [{ day: previousNumDays-i, dayOfWeek: (previousNumDays - i) % 7, hiddenDay:true }, ...days]; | ||
} | ||
|
||
let days = []; | ||
for (let i = 1; i <= numDays; i++) { | ||
days.push({ day: i, dayOfWeek: (offset + i) % 7 }); | ||
} | ||
// Calculate positiveOffset | ||
// The calendar will display 42 days (6 rows of 7 columns) | ||
// Knowing this the offset is 41 (we start at index 0) | ||
// minus (the previous offset + the current month days) | ||
const positiveOffset = 41 - (numDays + offset); | ||
for (let i = 0; i < positiveOffset; i++) { | ||
days.push( {day:i+1, dayOfWeek:((numDays + offset) + i) % 7, hiddenDay: true} ) | ||
} | ||
|
||
for (let i = 0; i <= offset; i++) { | ||
days = [{ day: null, dayOfWeek: null }, ...days]; | ||
} else { | ||
for (let i = 0; i <= offset; i++) { | ||
days = [{ day: null, dayOfWeek: null, hiddenDay:true }, ...days]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wouldn't |
||
} | ||
} | ||
|
||
return days; | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't this calculation be done through
getDaysOfMonth
?