diff --git a/packages/core/package.json b/packages/core/package.json index 1641cf77..d0b2e5da 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@viamrobotics/prime-core", - "version": "0.0.94", + "version": "0.0.95", "publishConfig": { "access": "public" }, diff --git a/packages/core/src/lib/__tests__/label.spec.ts b/packages/core/src/lib/__tests__/label.spec.ts index cb30fbcb..cf24390b 100644 --- a/packages/core/src/lib/__tests__/label.spec.ts +++ b/packages/core/src/lib/__tests__/label.spec.ts @@ -16,8 +16,7 @@ describe('Label', () => { render(Label, { position: 'left' }); const label = screen.getByText('Name:'); - expect(label).toHaveClass('text-xs text-subtle-1'); - expect(label).toHaveClass('inline whitespace-nowrap'); + expect(label).toHaveClass('inline text-xs text-subtle-1'); }); it('Renders the label text as disabled', () => { diff --git a/packages/core/src/lib/__tests__/pill.spec.ts b/packages/core/src/lib/__tests__/pill.spec.ts index 98a1d8ca..f4a565c3 100644 --- a/packages/core/src/lib/__tests__/pill.spec.ts +++ b/packages/core/src/lib/__tests__/pill.spec.ts @@ -46,11 +46,6 @@ describe('Pill', () => { ); }); - it('Renders a resource pill that is not removable if a removable attribute of true has not been specified', () => { - render(Pill, { variant: 'outlined', removable: false }); - expect(screen.queryByRole('button')).toBeNull(); - }); - it('Confirms default pill is clickable', async () => { const { component } = render(Pill); const onClick = vi.fn(); diff --git a/packages/core/src/lib/__tests__/radio.spec.ts b/packages/core/src/lib/__tests__/radio.spec.ts index 520f9a5d..5205d6d9 100644 --- a/packages/core/src/lib/__tests__/radio.spec.ts +++ b/packages/core/src/lib/__tests__/radio.spec.ts @@ -74,13 +74,6 @@ describe('Radio', () => { expect(legend).toHaveClass('after:text-danger-dark after:content-["*"]'); }); - it('Renders in a row if specified', () => { - render(Radio, { ...common, direction: 'row' }); - expect( - screen.getByText('Test radio options').nextElementSibling - ).toHaveClass('flex-row gap-2'); - }); - it('Renders in a column if specified', () => { render(Radio, { ...common, direction: 'col' }); expect( diff --git a/packages/core/src/lib/label.svelte b/packages/core/src/lib/label.svelte index cf901931..4ee2f3df 100644 --- a/packages/core/src/lib/label.svelte +++ b/packages/core/src/lib/label.svelte @@ -51,7 +51,7 @@ export { extraClasses as cx }; > { { 'cursor-not-allowed bg-disabled-light text-disabled-dark': disabled || readonly, - 'gap-1 bg-medium px-2 py-0.5': variant === 'default', - 'h-6 gap-1.5 border border-medium bg-light pl-1.5 pr-2': - variant === 'outlined', + 'gap-1 bg-medium px-2 py-0.5': !icon, + 'h-6 gap-1.5 border border-medium bg-light pl-1.5 pr-2': icon, }, extraClasses )} aria-disabled={disabled ? true : undefined} aria-readonly={readonly ? true : undefined} > - {#if icon && variant === 'outlined'} + {#if icon} {/if} -
+
{#each optionsInternal as { label, value, description, icon }} {@const isSelected = value === selected} {@const radioIcon = isSelected ? 'radiobox-marked' : 'radiobox-blank'} @@ -89,7 +81,7 @@ $: handleDisabledKeydown = preventKeyboardHandler(disabled); position="left" {disabled} cx={[ - 'whitespace-nowrap text-xs', + 'cursor-pointer text-xs', { 'text-subtle-1': !isSelected && !disabled, 'cursor-not-allowed text-disabled-dark': disabled, @@ -110,14 +102,16 @@ $: handleDisabledKeydown = preventKeyboardHandler(disabled); on:click|capture={handleDisabled} on:keydown|capture={handleDisabledKeydown} /> - +
+ +
{#if icon} diff --git a/packages/core/src/routes/+page.svelte b/packages/core/src/routes/+page.svelte index 46a62117..9e245608 100644 --- a/packages/core/src/routes/+page.svelte +++ b/packages/core/src/routes/+page.svelte @@ -1109,20 +1109,12 @@ const onHoverDelayMsInput = (event: Event) => { disabled value="Baz" /> -
- - -

Outlined Pill

-
@@ -1188,14 +1180,27 @@ const onHoverDelayMsInput = (event: Event) => { > Disabled Radio +
+
- Row Radio + Upload model
diff --git a/packages/storybook/src/stories/pill.mdx b/packages/storybook/src/stories/pill.mdx index f45b322b..5389406a 100644 --- a/packages/storybook/src/stories/pill.mdx +++ b/packages/storybook/src/stories/pill.mdx @@ -27,9 +27,9 @@ import { Pill } from '@viamrobotics/prime-core'; - + - + diff --git a/packages/storybook/src/stories/pill.stories.svelte b/packages/storybook/src/stories/pill.stories.svelte index c3b9b8bf..37099158 100644 --- a/packages/storybook/src/stories/pill.stories.svelte +++ b/packages/storybook/src/stories/pill.stories.svelte @@ -30,43 +30,37 @@ import { Pill } from '@viamrobotics/prime-core';
- +
- +