Skip to content

Commit 0d29cc8

Browse files
authored
Rnd1/fix warnings in storybook (ocaml#543)
* Remove log statement * Remove another Js.log * Fix warnings in storybook page
1 parent 7647168 commit 0d29cc8

12 files changed

+73
-60
lines changed

pages/[lang]/community/aroundweb.res

+4-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,10 @@ module T = {
163163
<SectionContainer.LargeCentered paddingY="pb-14">
164164
<CardGrid
165165
cardData=content.spaces
166-
renderCard={s => <ShortWideCard name=s.name logoSrc=s.logoSrc url=s.url />}
166+
renderCard={(idx, s) =>
167+
<div key={string_of_int(idx)}>
168+
<ShortWideCard name=s.name logoSrc=s.logoSrc url=s.url />
169+
</div>}
167170
title=content.spacesSectionHeader
168171
/>
169172
</SectionContainer.LargeCentered>

pages/[lang]/resources/tutorials.res

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ module T = {
3333
<div className="pb-8">
3434
<CardGrid
3535
cardData=content.tutorials
36-
renderCard={(t: Ood.Tutorial.t) => <Tutorial tutorial=t lang />}
36+
renderCard={(idx, t: Ood.Tutorial.t) =>
37+
<div key={string_of_int(idx)}> <Tutorial tutorial=t lang /> </div>}
3738
/>
3839
</div>
3940
</Page.Basic>

pages/storybook.res

+10-8
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@ module Item = {
2222
<h2 className="font-black text-4xl"> {React.string(`<${name} />`)} </h2>
2323
<div className="mb-4 mt-8"> {docsElement} </div>
2424
{React.array(
25-
children->Belt.Array.map(((color, (doc, child))) => {
25+
children->Belt.Array.mapWithIndex((idx, (color, (doc, child))) => {
2626
<div
2727
className={`shadow overflow-hidden border-b border-gray-200 sm:rounded-lg ${colorClass(
2828
color,
29-
)} p-8 mb-8`}>
29+
)} p-8 mb-8`}
30+
key={string_of_int(idx)}>
3031
<div className="mb-2"> {React.string(doc)} </div> <hr /> {child}
3132
</div>
3233
}),
@@ -959,9 +960,7 @@ module Categories = {
959960
<div className="text-ocamlorange font-black">
960961
{React.string(Printf.sprintf("Foo-%d-%d", n, m))}
961962
</div>
962-
| #Bar =>
963-
Js.log(a)
964-
React.string(Printf.sprintf("Bar-%d-%d", n, m))
963+
| #Bar => React.string(Printf.sprintf("Bar-%d-%d", n, m))
965964
}
966965
}
967966
let detailsComponent = foobar => {
@@ -1275,16 +1274,19 @@ module Categories = {
12751274
(
12761275
"CardGrid rendered with strings for each element",
12771276
{
1278-
let renderCard = React.string
1277+
let renderCard = (idx, x) =>
1278+
<div key={string_of_int(idx)}> {React.string(x)} </div>
12791279
let title = "Example"
12801280
<CardGrid cardData renderCard title />
12811281
},
12821282
),
12831283
(
12841284
"CardGrid rendered with Cards for each element",
12851285
{
1286-
let renderCard = s =>
1287-
<Card title="<Card>" kind={#Opaque}> {React.string(s)} </Card>
1286+
let renderCard = (idx, s) =>
1287+
<div key={string_of_int(idx)}>
1288+
<Card title="<Card>" kind={#Opaque}> {React.string(s)} </Card>
1289+
</div>
12881290
let title = "Example"
12891291
<CardGrid cardData renderCard title />
12901292
},

src/CardGrid.res

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ let make = (~cardData, ~renderCard, ~title=?) => <>
1111
| None => <> </>
1212
}}
1313
<div className="grid grid-cols-1 lg:grid-cols-2 gap-x-28 gap-y-4 px-8">
14-
{cardData->Belt.Array.map(renderCard)->React.array}
14+
{cardData->Belt.Array.mapWithIndex(renderCard)->React.array}
1515
</div>
1616
</>

src/CardGrid.resi

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ open! Import
33
@react.component
44
let make: (
55
~cardData: array<'a>,
6-
~renderCard: 'a => React.element,
6+
~renderCard: (int, 'a) => React.element,
77
~title: string=?,
88
) => React.element

src/ContentGrid.res

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ let make = (~title, ~renderChild, ~cols, ~children) => {
3737
},
3838
])
3939
}
40-
<div className=border>
40+
<div className=border key={string_of_int(i)}>
4141
<div
4242
className="h-24 flex items-center justify-center px-4 font-bold bg-white mx-8 my-3 rounded">
4343
<p className="text-center"> {renderChild(child)} </p>

src/HeaderNavigation.res

+30-30
Original file line numberDiff line numberDiff line change
@@ -296,37 +296,37 @@ let make = (~content) => {
296296
</div>
297297
</div>
298298
<div className="mt-6">
299-
<nav className="grid gap-y-2">
300-
{Js.Array.concatMany(
301-
Js.Array.map(
302-
(section: section) =>
303-
Js.Array.concat(
304-
Js.Array.mapi(
305-
(e: NavEntry.t, idx) =>
306-
<Next.Link href=e.url key={Js.Int.toString(idx)}>
307-
<a
308-
onClick=hideMobileMenu
309-
className="text-gray-600 hover:bg-gray-50 hover:text-gray-900 group flex items-center px-2 py-2 text-sm font-medium rounded-md">
310-
<span
311-
className="text-gray-400 group-hover:text-gray-500 mr-3 flex-shrink-0 h-5 w-5 stroke-current fill-current stroke-2">
312-
{e.icon}
313-
</span>
314-
<span className="font-bold"> {React.string(e.label)} </span>
315-
</a>
316-
</Next.Link>,
317-
section.entries,
318-
),
319-
[
320-
<h3 className="ml-6 mt-2 px-3 font-semibold text-gray-400 uppercase">
321-
{React.string(section.header)}
322-
</h3>,
323-
],
299+
<nav className="grid gap-y-2"> {Js.Array.concatMany(Js.Array.map((section: section) => {
300+
let len = Belt.Array.length(section.entries)
301+
Js.Array.concat(
302+
Js.Array.mapi(
303+
(e: NavEntry.t, idx) =>
304+
<Next.Link href=e.url key={Js.Int.toString(idx)}>
305+
<a
306+
onClick=hideMobileMenu
307+
className="text-gray-600 hover:bg-gray-50 hover:text-gray-900 group flex items-center px-2 py-2 text-sm font-medium rounded-md">
308+
<span
309+
className="text-gray-400 group-hover:text-gray-500 mr-3 flex-shrink-0 h-5 w-5 stroke-current fill-current stroke-2">
310+
{e.icon}
311+
</span>
312+
<span className="font-bold"> {React.string(e.label)} </span>
313+
</a>
314+
</Next.Link>,
315+
section.entries,
324316
),
325-
[content.principlesSection, content.resourcesSection, content.communitySection],
326-
),
327-
[],
328-
) |> React.array}
329-
</nav>
317+
[
318+
<h3
319+
className="ml-6 mt-2 px-3 font-semibold text-gray-400 uppercase"
320+
key={string_of_int(len)}>
321+
{React.string(section.header)}
322+
</h3>,
323+
],
324+
)
325+
}, [
326+
content.principlesSection,
327+
content.resourcesSection,
328+
content.communitySection,
329+
]), []) |> React.array} </nav>
330330
</div>
331331
</div>
332332
</div>

src/LogoCloud.res

+6-4
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,14 @@ let make = (~companies) =>
6464
<div className="mt-6 grid grid-cols-1 gap-0.5 md:grid-cols-3 lg:mt-8">
6565
{switch companies {
6666
| #LogoOnly(companies) =>
67-
companies->Js.Array2.map((c: Company.t) =>
68-
<div className="col-span-1"> <CompanyCard key=c.name company={#Required(c)} /> </div>
67+
companies->Js.Array2.mapi((c: Company.t, idx) =>
68+
<div className="col-span-1" key={string_of_int(idx)}>
69+
<CompanyCard key=c.name company={#Required(c)} />
70+
</div>
6971
)
7072
| #LogoWithText(companies) =>
71-
companies->Js.Array2.map((c: CompanyOptionalLogo.t) =>
72-
<CompanyCard key=c.name company={#Optional(c)} />
73+
companies->Js.Array2.mapi((c: CompanyOptionalLogo.t, idx) =>
74+
<div key={string_of_int(idx)}> <CompanyCard key=c.name company={#Optional(c)} /> </div>
7375
)
7476
}->React.array}
7577
</div>

src/MediaCarousel.res

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ let make = (
7474
<div className="col-span-6 py-2 flex m-w-full overflow-x-hidden">
7575
{items
7676
->Belt.Array.mapWithIndex((id, item) => {
77-
Js.log(item)
7877
<div
7978
className="px-4 flex items-center justify-center"
8079
key={string_of_int(id)}

src/Stats.res

+6-4
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,23 @@ let make = (~title: string, ~children as items: array<Item.t>) =>
4444
{
4545
let len = Belt.Array.length(items)
4646
React.array(
47-
items->Belt.Array.mapWithIndex((i, item) => {
47+
items->Belt.Array.mapWithIndex((idx, item) => {
4848
let borderSizes = [
4949
"sm:border-0",
50-
if i != len - 1 {
50+
if idx != len - 1 {
5151
"border-b sm:border-r"
5252
} else {
5353
""
5454
},
55-
if i != 0 {
55+
if idx != 0 {
5656
"border-t sm:border-l"
5757
} else {
5858
""
5959
},
6060
]->Js.String.concatMany(" ")
61-
<Box label=item.label statValue=item.value borderSizes />
61+
<div key={string_of_int(idx)}>
62+
<Box label=item.label statValue=item.value borderSizes />
63+
</div>
6264
}),
6365
)
6466
}

src/Table.res

+11-7
Original file line numberDiff line numberDiff line change
@@ -70,23 +70,24 @@ module Regular = {
7070
{
7171
let len = Belt.Array.length(columns)
7272
React.array(
73-
columns->Belt.Array.mapWithIndexU((. i, column) => {
73+
columns->Belt.Array.mapWithIndexU((. idx, column) => {
7474
let rounding = {
7575
[
76-
if i == 0 {
76+
if idx == 0 {
7777
"rounded-tl"
7878
} else {
7979
""
8080
},
81-
if i == len - 1 {
81+
if idx == len - 1 {
8282
"rounded-tr"
8383
} else {
8484
""
8585
},
8686
]->Js.String.concatMany(" ")
8787
}
8888
<th
89-
className={`py-2 px-3 ${rounding} sticky top-0 border-b border-gray-200 bg-yellow-300`}>
89+
className={`py-2 px-3 ${rounding} sticky top-0 border-b border-gray-200 bg-yellow-300`}
90+
key={string_of_int(idx)}>
9091
{React.string(column.title)}
9192
</th>
9293
}),
@@ -100,9 +101,12 @@ module Regular = {
100101
key={"r" ++ string_of_int(i)}
101102
className="border-double border-t-4 border-gray-200 hover:bg-yellow-50">
102103
{React.array(
103-
columns->Belt.Array.map(({title, component, className}) =>
104-
<td className> {React.createElement(component, map)} </td>
105-
),
104+
columns->Belt.Array.mapWithIndex((idx, {title, component, className}) => {
105+
let _title = title
106+
<td className key={string_of_int(idx)}>
107+
{React.createElement(component, map)}
108+
</td>
109+
}),
106110
)}
107111
</tr>
108112
),

src/VerticalHighlightCard.res

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type item = {
1010
let make = (~title, ~buttonText, ~buttonRoute, ~lang, ~children) => {
1111
let (item1, item2, item3) = children
1212
let renderItem = (i, item) => {
13-
<div>
13+
<div key={string_of_int(i)}>
1414
<p className="text-orangedark text-7xl font-bold"> {React.string(`${string_of_int(i)}.`)} </p>
1515
// TODO: visual indicator that link will open new tab
1616
<p className="font-bold">

0 commit comments

Comments
 (0)