Skip to content

Commit d65659f

Browse files
committed
TimeTable - fixed missing bottom blue border when row had no items
1 parent db364ac commit d65659f

File tree

2 files changed

+4
-133
lines changed

2 files changed

+4
-133
lines changed

library/src/components/timetable/TimeTableRows.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,14 +967,15 @@ function TableCell<G extends TimeTableGroup, I extends TimeSlotBooking>({
967967
)}
968968
{isFocused && (
969969
<div
970+
data-test={`${groupItemRows?.length}_${rowNumber}`}
970971
className={twJoin(
971972
"absolute inset-0 z-1",
972973
isFocused &&
973974
"border-l-3 border-r-3 border-brand-bold border-solid",
974975
rowNumber === 0 &&
975976
timeSlotSelectionDisabled &&
976977
"border-t-3",
977-
rowNumber === (groupItemRows?.length ?? 0) - 1 &&
978+
rowNumber === (groupItemRows?.length || 1) - 1 &&
978979
"border-b-3",
979980
)}
980981
/>
@@ -1042,7 +1043,7 @@ function PlaceholderTableCell<
10421043
}
10431044

10441045
const timeSlotSelectedIndex = selectedTimeSlots
1045-
? selectedTimeSlots?.findIndex((it) => it === timeSlotNumber)
1046+
? selectedTimeSlots?.indexOf(timeSlotNumber)
10461047
: -1
10471048

10481049
const isFirstOfSelection =

showcase/public/showcase-sources.txt

Lines changed: 1 addition & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -6229,22 +6229,13 @@ function MenuShowcase(props: ShowcaseProps) {
62296229

62306230
export default MenuShowcase
62316231

6232-
/*import {
6233-
default as AKModal,
6234-
ModalBody as AKModalBody,
6235-
ModalFooter as AKModalFooter,
6236-
ModalHeader as AKModalHeader,
6237-
ModalTitle as AKModalTitle,
6238-
ModalTransition as AKModalTransition,
6239-
} from "@atlaskit/modal-dialog"*/
62406232
import {
62416233
Button,
62426234
Collapsible,
62436235
Dropdown,
62446236
Modal,
62456237
Select,
62466238
} from "@linked-planet/ui-kit-ts"
6247-
//import { default as AKSelect } from "@atlaskit/select"
62486239
import { DropdownMenuItem } from "@radix-ui/react-dropdown-menu"
62496240
import { XIcon } from "lucide-react"
62506241
import { useEffect, useRef, useState } from "react"
@@ -6254,122 +6245,6 @@ import ShowcaseWrapperItem, {
62546245
type ShowcaseProps,
62556246
} from "../../ShowCaseWrapperItem/ShowcaseWrapperItem"
62566247

6257-
function AKExample() {
6258-
const [isAKModalActive, setIsAKModalActive] = useState(false)
6259-
6260-
const selectOptions = []
6261-
for (let i = 0; i < 100; i++) {
6262-
selectOptions.push({
6263-
label: i.toString(),
6264-
value: i.toString(),
6265-
})
6266-
}
6267-
6268-
return (
6269-
<>
6270-
<div>AKModal: {isAKModalActive.toString()}</div>
6271-
<Button onClick={() => setIsAKModalActive(true)}>
6272-
Show AK Modal
6273-
</Button>
6274-
6275-
{/*isAKModalActive && (
6276-
<AKModalTransition>
6277-
<AKModal onClose={() => setIsAKModalActive(false)}>
6278-
<AKModalHeader>
6279-
<AKModalTitle>Sample Modal</AKModalTitle>
6280-
<Button
6281-
appearance="link"
6282-
onClick={() => setIsAKModalActive(false)}
6283-
>
6284-
<CrossIcon label="Close popup" />
6285-
</Button>
6286-
</AKModalHeader>
6287-
6288-
<AKModalBody>
6289-
<p>This is the body of the AK modal.</p>
6290-
<AKSelect options={selectOptions} />
6291-
<Select
6292-
placeholder="Choose"
6293-
options={selectOptions}
6294-
className="z-10"
6295-
/>
6296-
Lorem, ipsum dolor sit amet consectetur adipisicing
6297-
elit. Distinctio ipsam harum rerum quia, nam, autem
6298-
non, commodi expedita dolore quisquam saepe odit
6299-
maiores id alias reiciendis. Aut aperiam minus eum.
6300-
Lorem ipsum dolor sit amet consectetur adipisicing
6301-
elit. Illum quos dolorum officia id porro illo sit
6302-
voluptates error doloremque? Iste deserunt amet illo
6303-
incidunt modi. Facilis reiciendis ratione at
6304-
veritatis. Lorem ipsum dolor sit amet consectetur,
6305-
adipisicing elit. Deserunt non, perspiciatis
6306-
voluptate cumque vel eveniet ratione sequi ullam
6307-
facilis! Beatae, voluptatem aperiam consequatur
6308-
assumenda consectetur possimus accusantium maxime
6309-
similique labore! Lorem ipsum dolor sit amet
6310-
consectetur, adipisicing elit. Ullam, possimus
6311-
facere ut odit mollitia vel consectetur earum
6312-
reiciendis beatae inventore fugiat, quo eaque ipsum
6313-
soluta facilis doloremque, voluptatibus odio
6314-
officiis. Lorem ipsum dolor sit amet consectetur
6315-
adipisicing elit. Laudantium voluptatum aut
6316-
voluptates distinctio nam neque dolore, maiores
6317-
autem impedit, doloribus eveniet laborum
6318-
necessitatibus ex! Possimus odit in commodi nulla
6319-
architecto. Lorem ipsum dolor sit amet consectetur
6320-
adipisicing elit. Officia, facere reiciendis
6321-
incidunt obcaecati aut corrupti tempora commodi nam
6322-
aspernatur et quas beatae delectus perspiciatis
6323-
alias quia inventore molestias quis exercitationem?
6324-
Lorem, ipsum dolor sit amet consectetur adipisicing
6325-
elit. Blanditiis temporibus doloremque nam molestiae
6326-
quidem, repellendus eligendi ex magnam quasi. Est
6327-
doloribus quam accusantium? Consequuntur, vel
6328-
sapiente alias repudiandae nisi soluta. Lorem ipsum
6329-
dolor sit amet consectetur adipisicing elit.
6330-
Reiciendis, quibusdam maxime. Numquam, explicabo! At
6331-
vero eligendi cupiditate vel molestias eos sint,
6332-
obcaecati minus suscipit ducimus libero
6333-
reprehenderit, itaque debitis atque? Lorem ipsum
6334-
dolor sit amet, consectetur adipisicing elit.
6335-
Repellendus vero consequatur velit dolores neque
6336-
distinctio harum tempore. Vitae, doloribus
6337-
perferendis! Deserunt reprehenderit dolor tempora
6338-
atque amet officiis ea, velit iste. Lorem ipsum
6339-
dolor sit, amet consectetur adipisicing elit. Est
6340-
nemo accusamus, inventore assumenda et nulla. Eius,
6341-
consequuntur repudiandae ea corrupti eos magni
6342-
itaque temporibus blanditiis aspernatur, earum quam
6343-
ut. Laudantium. Lorem ipsum dolor sit amet
6344-
consectetur adipisicing elit. Doloremque recusandae,
6345-
distinctio in fuga vero ullam tempora nisi laborum
6346-
unde architecto, doloribus dicta fugiat itaque
6347-
voluptatibus dolorum vel aspernatur, inventore nemo?
6348-
Lorem ipsum dolor sit amet consectetur adipisicing
6349-
elit. Error, corporis animi. Praesentium voluptate,
6350-
optio tenetur harum odio sequi eos possimus officiis
6351-
dignissimos. Laboriosam voluptates fuga est.
6352-
Deserunt quod officia harum!
6353-
</AKModalBody>
6354-
6355-
<AKModalFooter>
6356-
<ButtonGroup>
6357-
<Button
6358-
autoFocus={true}
6359-
appearance="primary"
6360-
onClick={() => setIsAKModalActive(false)}
6361-
>
6362-
Close
6363-
</Button>
6364-
</ButtonGroup>
6365-
</AKModalFooter>
6366-
</AKModal>
6367-
</AKModalTransition>
6368-
)*/}
6369-
</>
6370-
)
6371-
}
6372-
63736248
function ControlledExample() {
63746249
const selectOptions = []
63756250
for (let i = 0; i < 100; i++) {
@@ -6551,12 +6426,7 @@ function ModalTest() {
65516426
}
65526427

65536428
function ModalShowcase(props: ShowcaseProps) {
6554-
const example = (
6555-
<>
6556-
<AKExample />
6557-
<ControlledExample />
6558-
</>
6559-
)
6429+
const example = <ControlledExample />
65606430

65616431
return (
65626432
<ShowcaseWrapperItem

0 commit comments

Comments
 (0)