@bitrise/bitkit 13.31.0 → 13.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -14,10 +14,10 @@ const baseStyle = defineStyle((props) => {
|
|
|
14
14
|
borderLeftRadius: '4',
|
|
15
15
|
},
|
|
16
16
|
// Selects the last .chakra-button item even is there an another element after that (eg menu)
|
|
17
|
-
'
|
|
17
|
+
':not(:has(~ .chakra-button))': {
|
|
18
18
|
borderRightRadius: '4',
|
|
19
19
|
},
|
|
20
|
-
[
|
|
20
|
+
[`:not(:first-child)${ignoreSsrWarning}`]: {
|
|
21
21
|
...(props.variant.includes('primary')
|
|
22
22
|
? {
|
|
23
23
|
_before: {
|
|
@@ -27,11 +27,12 @@ const baseStyle = defineStyle((props) => {
|
|
|
27
27
|
top: `-${rem(1)}`,
|
|
28
28
|
bottom: `-${rem(1)}`,
|
|
29
29
|
width: rem(1),
|
|
30
|
-
backgroundColor: '
|
|
30
|
+
backgroundColor: 'border/on-contrast',
|
|
31
|
+
zIndex: 1,
|
|
31
32
|
},
|
|
32
33
|
}
|
|
33
34
|
: {}),
|
|
34
|
-
|
|
35
|
+
marginInlineStart: `-${rem(1)}`,
|
|
35
36
|
},
|
|
36
37
|
},
|
|
37
38
|
};
|
|
@@ -96,6 +97,7 @@ const variants = (
|
|
|
96
97
|
backgroundColor: `button/${variant}/bg-hover`,
|
|
97
98
|
borderColor: variant?.includes('secondary') ? `button/${variant}/border-hover` : `button/${variant}/bg-hover`,
|
|
98
99
|
color: `button/${variant}/fg-hover`,
|
|
100
|
+
zIndex: 1,
|
|
99
101
|
},
|
|
100
102
|
_active: {
|
|
101
103
|
backgroundColor: `button/${variant}/bg-active`,
|
|
@@ -3,7 +3,6 @@ import { chakra } from '@chakra-ui/react';
|
|
|
3
3
|
import { cx } from '@chakra-ui/utils';
|
|
4
4
|
import Text, { TextProps } from '../Text/Text';
|
|
5
5
|
import Divider from '../Divider/Divider';
|
|
6
|
-
import Tooltip from '../Tooltip/Tooltip';
|
|
7
6
|
import { useDropdownContext, useDropdownStyles } from './Dropdown.context';
|
|
8
7
|
|
|
9
8
|
export type DropdownOptionProps<T> = {
|
|
@@ -12,12 +11,10 @@ export type DropdownOptionProps<T> = {
|
|
|
12
11
|
'aria-label'?: string;
|
|
13
12
|
onClick?: MouseEventHandler<HTMLElement>;
|
|
14
13
|
isDisabled?: boolean;
|
|
15
|
-
disabledText?: string;
|
|
16
14
|
};
|
|
17
15
|
const DropdownOption = <T = string,>({
|
|
18
16
|
children,
|
|
19
17
|
isDisabled,
|
|
20
|
-
disabledText,
|
|
21
18
|
onClick,
|
|
22
19
|
value = null,
|
|
23
20
|
...rest
|
|
@@ -55,9 +52,7 @@ const DropdownOption = <T = string,>({
|
|
|
55
52
|
},
|
|
56
53
|
)}
|
|
57
54
|
>
|
|
58
|
-
|
|
59
|
-
{children}
|
|
60
|
-
</Tooltip>
|
|
55
|
+
{children}
|
|
61
56
|
</chakra.div>
|
|
62
57
|
);
|
|
63
58
|
};
|
|
@@ -90,7 +85,6 @@ type DropdownDetailedOptionProps<T> = DropdownOptionProps<T> & {
|
|
|
90
85
|
icon: ReactNode;
|
|
91
86
|
title: string;
|
|
92
87
|
subtitle: string;
|
|
93
|
-
disabledText?: string;
|
|
94
88
|
};
|
|
95
89
|
|
|
96
90
|
const DropdownDetailedOption = <T = string,>({
|
|
@@ -98,7 +92,6 @@ const DropdownDetailedOption = <T = string,>({
|
|
|
98
92
|
title,
|
|
99
93
|
subtitle,
|
|
100
94
|
isDisabled,
|
|
101
|
-
disabledText,
|
|
102
95
|
...rest
|
|
103
96
|
}: DropdownDetailedOptionProps<T>) => {
|
|
104
97
|
return (
|
|
@@ -106,9 +99,7 @@ const DropdownDetailedOption = <T = string,>({
|
|
|
106
99
|
<chakra.div alignItems="center" display="flex" flexDir="row" gap="12">
|
|
107
100
|
<chakra.div opacity={isDisabled ? '0.5' : '1'}>{icon}</chakra.div>
|
|
108
101
|
<chakra.div>
|
|
109
|
-
|
|
110
|
-
{title}
|
|
111
|
-
</Tooltip>
|
|
102
|
+
{title}
|
|
112
103
|
<Text color={isDisabled ? 'text/disabled' : 'input/text/helper'} size="2">
|
|
113
104
|
{subtitle}
|
|
114
105
|
</Text>
|