Merge branch 'main' into feat/breadcrumb-ellipsis

yamada-ui · Apr 28, 2024 · d5f9ce4 · d5f9ce4
2 parents 8d01318 + 169a760
commit d5f9ce4
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 15 deletions.
diff --git a/.changeset/forty-buckets-dress.md b/.changeset/forty-buckets-dress.md
@@ -0,0 +1,5 @@
+---
+"@yamada-ui/utils": minor
+---
+
+Added `isBoolean` function.
diff --git a/.changeset/ten-hotels-yawn.md b/.changeset/ten-hotels-yawn.md
@@ -0,0 +1,5 @@
+---
+"@yamada-ui/core": patch
+---
+
+Fixed a bug where TextStyles and LayerStyles have more types than necessary.
diff --git a/.changeset/twenty-tips-push.md b/.changeset/twenty-tips-push.md
@@ -0,0 +1,5 @@
+---
+"@yamada-ui/calendar": patch
+---
+
+Fixed to set `display: none` on button if a custom component is not displayed element (e.g. null, undefined, boolean) in order to address a11y violations.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -5,7 +5,7 @@ Please read the following before submitting:
 - PRs that adds new external dependencies might take a while to review.
 - Keep your PR as small as possible.
 - Limit your PR to one type (docs, feature, refactoring, ci, or bugfix)
-- If a PR is not merged within one week of its creation, core members may intervene.
+- If a PR is not merged within one week of its creation, maintainers may intervene.
 -->
 
 Closes # <!-- Github issue # here -->

diff --git a/packages/components/calendar/src/month.tsx b/packages/components/calendar/src/month.tsx
@@ -2,7 +2,14 @@ import type { ButtonProps } from "@yamada-ui/button"
 import { Button } from "@yamada-ui/button"
 import type { HTMLUIProps } from "@yamada-ui/core"
 import { ui } from "@yamada-ui/core"
-import { cx, dataAttr, filterUndefined } from "@yamada-ui/utils"
+import {
+  cx,
+  dataAttr,
+  filterUndefined,
+  isBoolean,
+  isNull,
+  isUndefined,
+} from "@yamada-ui/utils"
 import dayjs from "dayjs"
 import type { FC } from "react"
 import { useMemo } from "react"
@@ -188,6 +195,19 @@ export const Month: FC<MonthProps> = ({
                             index,
                           })
 
+                          const day = customDay({
+                            date,
+                            row,
+                            col,
+                            weekday: weekdays[col],
+                            isSelected,
+                            isWeekend,
+                            isOutside,
+                          })
+
+                          const isDisplayed =
+                            !isNull(day) && !isUndefined(day) && !isBoolean(day)
+
                           return (
                             <ui.td
                               key={col}
@@ -206,20 +226,14 @@ export const Month: FC<MonthProps> = ({
                                   p: 0,
                                   fontSize: undefined,
                                   fontWeight: "normal",
-                                  ...(isHidden ? { display: "none" } : {}),
+                                  ...(isHidden || !isDisplayed
+                                    ? { display: "none" }
+                                    : {}),
                                   ...styles.day,
                                 }}
                                 {...props}
                               >
-                                {customDay({
-                                  date,
-                                  row,
-                                  col,
-                                  weekday: weekdays[col],
-                                  isSelected,
-                                  isWeekend,
-                                  isOutside,
-                                })}
+                                {day}
                               </Button>
                             </ui.td>
                           )

diff --git a/packages/core/src/theme.types.ts b/packages/core/src/theme.types.ts
@@ -457,8 +457,8 @@ export type ThemeConfig = {
   }
 }
 
-export type LayerStyles = Record<string, UIStyle>
-export type TextStyles = Record<string, UIStyle>
+export type LayerStyles = Record<string, CSSUIObject>
+export type TextStyles = Record<string, CSSUIObject>
 export type ThemeTokens = {
   [key: string | number]:
     | string

diff --git a/packages/utils/src/assertion.ts b/packages/utils/src/assertion.ts
@@ -13,6 +13,9 @@ export const isNumeric = (value: any): boolean =>
 export const isString = (value: any): value is string =>
   Object.prototype.toString.call(value) === "[object String]"
 
+export const isBoolean = (value: any): value is boolean =>
+  typeof value === "boolean"
+
 export const isUndefined = (value: any): value is undefined =>
   typeof value === "undefined" && value === undefined
 

diff --git a/scripts/observe-pull-requests.ts b/scripts/observe-pull-requests.ts
@@ -33,7 +33,7 @@ const GITHUB_JOINING_COMMENT = (id: string) =>
   [
     `@${id}`,
     `Hi, Thanks for the PR!`,
-    `A week has passed since this PR was created, so core members will be joining this PR.`,
+    `A week has passed since this PR was created, so maintainers will be joining this PR.`,
   ].join("\n\n")
 const DISCORD_HELP_WANTED_COMMENT = (
   number: number,

diff --git a/stories/components/overlay/menu.stories.tsx b/stories/components/overlay/menu.stories.tsx
@@ -58,6 +58,7 @@ export const withCommand: Story = () => {
       <MenuButton
         as={IconButton}
         icon={<Icon icon={faBars} />}
+        aria-label="Menu"
         variant="outline"
       />
 
@@ -76,6 +77,7 @@ export const withIcon: Story = () => {
       <MenuButton
         as={IconButton}
         icon={<Icon icon={faBars} />}
+        aria-label="Menu"
         variant="outline"
       />