Post-Merge Label and Switch conflict fix (#528)

* Added missing ? to direction for conditional * Updated pagination to new direction prop
future-standard · Dec 9, 2024 · 2017ffb · 2017ffb
1 parent 68f1fae
commit 2017ffb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/ui-lib/src/Form/atoms/Label.tsx b/packages/ui-lib/src/Form/atoms/Label.tsx
@@ -15,7 +15,7 @@ const LabelText = styled.span<{ required?: boolean }>`
   `}
 `;
 
-export const StyledLabel = styled.label<{ direction: TypeLabelDirection }>`
+export const StyledLabel = styled.label<{ direction?: TypeLabelDirection }>`
   font-family: var(--font-ui);
   color: var(--grey-11);
   font-size: 14px;

diff --git a/packages/ui-lib/src/Misc/molecules/Pagination.tsx b/packages/ui-lib/src/Misc/molecules/Pagination.tsx
@@ -285,7 +285,7 @@ const Pagination: React.FC<IPagination> = (props) => {
       <ItemsSelectWrapper width={selectWidth}>
         <SelectField
           disabled={selectDisabled}
-          label={{ htmlFor: selectId, text: itemsText, isSameRow: true }}
+          label={{ htmlFor: selectId, text: itemsText, direction: 'row' }}
           defaultValue={itemsDefaultValue ? itemsDefaultValue : itemsOptions[0].value || 1}
           changeCallback={onItemsSelectChange}
         >