Skip to content

Commit b99dd57

Browse files
committed
fix(ui-instructure): use CondensedButton for AI component triggers
1 parent 18589e7 commit b99dd57

4 files changed

Lines changed: 28 additions & 48 deletions

File tree

packages/ui-instructure/src/DataPermissionLevels/v1/index.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
*/
2424
import { useState } from 'react'
2525
import { Modal } from '@instructure/ui-modal/v11_6'
26-
import { Button, CloseButton } from '@instructure/ui-buttons/v11_6'
26+
import {
27+
Button,
28+
CloseButton,
29+
CondensedButton
30+
} from '@instructure/ui-buttons/v11_6'
2731
import { Heading } from '@instructure/ui-heading/v11_6'
2832
import { Text } from '@instructure/ui-text/v11_6'
29-
import { Link } from '@instructure/ui-link/v11_6'
3033
import { useStyle as useStyleNew } from '@instructure/emotion'
3134

3235
import { DataPermissionLevelsProps } from './props.js'
@@ -60,17 +63,9 @@ const DataPermissionLevels = ({
6063

6164
return (
6265
<div>
63-
<Link
64-
variant="standalone"
65-
onClick={(e) => {
66-
e.preventDefault()
67-
setOpen(true)
68-
}}
69-
forceButtonRole={false}
70-
href="#"
71-
>
66+
<CondensedButton onClick={() => setOpen(true)} aria-haspopup="dialog">
7267
{triggerText}
73-
</Link>
68+
</CondensedButton>
7469
<Modal
7570
size={fullscreen ? 'fullscreen' : 'medium'}
7671
open={open}

packages/ui-instructure/src/DataPermissionLevels/v2/index.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
*/
2424
import { useState } from 'react'
2525
import { Modal } from '@instructure/ui-modal/latest'
26-
import { Button, CloseButton } from '@instructure/ui-buttons/latest'
26+
import {
27+
Button,
28+
CloseButton,
29+
CondensedButton
30+
} from '@instructure/ui-buttons/latest'
2731
import { Heading } from '@instructure/ui-heading/latest'
2832
import { Text } from '@instructure/ui-text/latest'
29-
import { Link } from '@instructure/ui-link/latest'
3033
import { useStyleNew } from '@instructure/emotion'
3134

3235
import { DataPermissionLevelsProps } from './props.js'
@@ -60,17 +63,9 @@ const DataPermissionLevels = ({
6063

6164
return (
6265
<div>
63-
<Link
64-
variant="standalone"
65-
onClick={(e) => {
66-
e.preventDefault()
67-
setOpen(true)
68-
}}
69-
forceButtonRole={false}
70-
href="#"
71-
>
66+
<CondensedButton onClick={() => setOpen(true)} aria-haspopup="dialog">
7267
{triggerText}
73-
</Link>
68+
</CondensedButton>
7469
<Modal
7570
size={fullscreen ? 'fullscreen' : 'medium'}
7671
open={open}

packages/ui-instructure/src/NutritionFacts/v1/index.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
*/
2424
import { useState } from 'react'
2525
import { Modal } from '@instructure/ui-modal/v11_6'
26-
import { Button, CloseButton } from '@instructure/ui-buttons/v11_6'
26+
import {
27+
Button,
28+
CloseButton,
29+
CondensedButton
30+
} from '@instructure/ui-buttons/v11_6'
2731
import { Heading } from '@instructure/ui-heading/v11_6'
2832
import { Text } from '@instructure/ui-text/v11_6'
29-
import { Link } from '@instructure/ui-link/v11_6'
3033
import { useStyle as useStyleNew } from '@instructure/emotion'
3134

3235
import { NutritionFactsProps } from './props.js'
@@ -59,17 +62,9 @@ const NutritionFacts = ({
5962

6063
return (
6164
<div>
62-
<Link
63-
variant="standalone"
64-
onClick={(e) => {
65-
e.preventDefault()
66-
setOpen(true)
67-
}}
68-
forceButtonRole={false}
69-
href="#"
70-
>
65+
<CondensedButton onClick={() => setOpen(true)} aria-haspopup="dialog">
7166
{triggerText}
72-
</Link>
67+
</CondensedButton>
7368
<Modal
7469
open={open}
7570
onDismiss={() => {

packages/ui-instructure/src/NutritionFacts/v2/index.tsx

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@
2323
*/
2424
import { useState } from 'react'
2525
import { Modal } from '@instructure/ui-modal/latest'
26-
import { Button, CloseButton } from '@instructure/ui-buttons/latest'
26+
import {
27+
Button,
28+
CloseButton,
29+
CondensedButton
30+
} from '@instructure/ui-buttons/latest'
2731
import { Heading } from '@instructure/ui-heading/latest'
2832
import { Text } from '@instructure/ui-text/latest'
29-
import { Link } from '@instructure/ui-link/latest'
3033
import { useStyleNew } from '@instructure/emotion'
3134

3235
import { NutritionFactsProps } from './props.js'
@@ -59,17 +62,9 @@ const NutritionFacts = ({
5962

6063
return (
6164
<div>
62-
<Link
63-
variant="standalone"
64-
onClick={(e) => {
65-
e.preventDefault()
66-
setOpen(true)
67-
}}
68-
forceButtonRole={false}
69-
href="#"
70-
>
65+
<CondensedButton onClick={() => setOpen(true)} aria-haspopup="dialog">
7166
{triggerText}
72-
</Link>
67+
</CondensedButton>
7368
<Modal
7469
open={open}
7570
onDismiss={() => {

0 commit comments

Comments
 (0)