Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit24063f1

Browse files
fix: wakatime langs_count when layout=compact (anuraghazra#1041)
1 parentfef8bc3 commit24063f1

File tree

2 files changed

+42
-59
lines changed

2 files changed

+42
-59
lines changed

‎src/cards/wakatime-card.js

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ const createTextNode = ({
6161
constcardProgress=hideProgress
6262
?null
6363
:createProgressNode({
64-
x:110,
65-
y:4,
66-
progress:percent,
67-
color:progressBarColor,
68-
width:220,
69-
name:label,
70-
progressBarBackgroundColor,
71-
});
64+
x:110,
65+
y:4,
66+
progress:percent,
67+
color:progressBarColor,
68+
width:220,
69+
name:label,
70+
progressBarBackgroundColor,
71+
});
7272

7373
return`
7474
<g class="stagger" style="animation-delay:${staggerDelay}ms" transform="translate(25, 0)">
@@ -129,26 +129,15 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
129129
theme,
130130
});
131131

132-
conststatItems=languages
132+
constfilteredLanguages=languages
133133
?languages
134-
.filter((language)=>language.hours||language.minutes)
135-
.slice(0,langsCount)
136-
.map((language)=>{
137-
returncreateTextNode({
138-
id:language.name,
139-
label:language.name,
140-
value:language.text,
141-
percent:language.percent,
142-
progressBarColor:titleColor,
143-
progressBarBackgroundColor:textColor,
144-
hideProgress:hide_progress,
145-
});
146-
})
134+
.filter((language)=>language.hours||language.minutes)
135+
.slice(0,langsCount)
147136
:[];
148137

149138
// Calculate the card height depending on how many items there are
150139
// but if rank circle is visible clamp the minimum height to `150`
151-
letheight=Math.max(45+(statItems.length+1)*lheight,150);
140+
letheight=Math.max(45+(filteredLanguages.length+1)*lheight,150);
152141

153142
constcssStyles=getStyles({
154143
titleColor,
@@ -163,17 +152,17 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
163152
// RENDER COMPACT LAYOUT
164153
if(layout==="compact"){
165154
width=width+50;
166-
height=90+Math.round(languages.length/2)*25;
155+
height=90+Math.round(filteredLanguages.length/2)*25;
167156

168157
// progressOffset holds the previous language's width and used to offset the next language
169158
// so that we can stack them one after another, like this: [--][----][---]
170159
letprogressOffset=0;
171-
constcompactProgressBar=languages
172-
.map((lang)=>{
160+
constcompactProgressBar=filteredLanguages
161+
.map((language)=>{
173162
// const progress = (width * lang.percent) / 100;
174-
constprogress=((width-25)*lang.percent)/100;
163+
constprogress=((width-25)*language.percent)/100;
175164

176-
constlanguageColor=languageColors[lang.name]||"#858585";
165+
constlanguageColor=languageColors[language.name]||"#858585";
177166

178167
constoutput=`
179168
<rect
@@ -197,22 +186,33 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
197186
</mask>
198187
${compactProgressBar}
199188
${createLanguageTextNode({
200-
x:0,
201-
y:25,
202-
langs:languages,
203-
totalSize:100,
204-
}).join("")}
189+
x:0,
190+
y:25,
191+
langs:filteredLanguages,
192+
totalSize:100,
193+
}).join("")}
205194
`;
206195
}else{
207196
finalLayout=flexLayout({
208-
items:statItems.length
209-
?statItems
197+
items:filteredLanguages.length
198+
?filteredLanguages
199+
.map((language)=>{
200+
returncreateTextNode({
201+
id:language.name,
202+
label:language.name,
203+
value:language.text,
204+
percent:language.percent,
205+
progressBarColor:titleColor,
206+
progressBarBackgroundColor:textColor,
207+
hideProgress:hide_progress,
208+
});
209+
})
210210
:[
211-
noCodingActivityNode({
212-
color:textColor,
213-
text:i18n.t("wakatimecard.nocodingactivity"),
214-
}),
215-
],
211+
noCodingActivityNode({
212+
color:textColor,
213+
text:i18n.t("wakatimecard.nocodingactivity"),
214+
}),
215+
],
216216
gap:lheight,
217217
direction:"column",
218218
}).join("");

‎tests/__snapshots__/renderWakatimeCard.test.js.snap

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
155155
"
156156
<svg
157157
width=\\"495\\"
158-
height=\\"140\\"
159-
viewBox=\\"00495140\\"
158+
height=\\"115\\"
159+
viewBox=\\"00495115\\"
160160
fill=\\"none\\"
161161
xmlns=\\"http://www.w3.org/2000/svg\\"
162162
>
@@ -273,16 +273,6 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
273273
fill=\\"#2b7489\\"
274274
/>
275275
276-
<rect
277-
mask=\\"url(#rect-mask)\\"
278-
data-testid=\\"lang-progress\\"
279-
x=\\"7.1145\\"
280-
y=\\"0\\"
281-
width=\\"0.32550000000000007\\"
282-
height=\\"8\\"
283-
fill=\\"#cb171e\\"
284-
/>
285-
286276
287277
<gtransform=\\"translate(25,25)\\">
288278
<circlecx=\\"5\\"cy=\\"6\\"r=\\"5\\"fill=\\"#858585\\" />
@@ -298,13 +288,6 @@ exports[`Test Render Wakatime Card should render correctly with compact layout 1
298288
</text>
299289
</g>
300290
301-
<gtransform=\\"translate(25,50)\\">
302-
<circlecx=\\"5\\"cy=\\"6\\"r=\\"5\\"fill=\\"#cb171e\\" />
303-
<textdata-testid=\\"lang-name\\"x=\\"15\\"y=\\"10\\"class='lang-name'>
304-
YAML - 0 secs
305-
</text>
306-
</g>
307-
308291
309292
</svg>
310293

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp