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
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit62c8117

Browse files
arosenfeld2003darkwing
authored andcommitted
limit resultCount in QuickOpenModal to 100 sources (#8134)
1 parent5aaaf1a commit62c8117

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

‎src/components/QuickOpenModal.js‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ type GotoLocationType = {
6969
column?:number
7070
};
7171

72+
constmaxResults=100;
73+
7274
functionfilter(values,query){
7375
returnfuzzyAldrin.filter(values,query,{
7476
key:"value",
75-
maxResults:1000
77+
maxResults:maxResults
7678
});
7779
}
7880

@@ -82,6 +84,13 @@ export class QuickOpenModal extends Component<Props, State> {
8284
this.state={results:null,selectedIndex:0};
8385
}
8486

87+
setResults(results: ?Array<QuickOpenResult>){
88+
if(results){
89+
results=results.slice(0,maxResults);
90+
}
91+
this.setState({ results});
92+
}
93+
8594
componentDidMount(){
8695
const{ query, shortcutsModalEnabled, toggleShortcutsModal}=this.props;
8796

@@ -121,7 +130,7 @@ export class QuickOpenModal extends Component<Props, State> {
121130
const{ sources}=this.props;
122131
constresults=
123132
query=="" ?sources :filter(sources,this.dropGoto(query));
124-
returnthis.setState({results});
133+
returnthis.setResults(results);
125134
};
126135

127136
searchSymbols=(query:string)=>{
@@ -133,31 +142,28 @@ export class QuickOpenModal extends Component<Props, State> {
133142
results=results.filter(result=>result.title!=="anonymous");
134143

135144
if(query==="@"||query==="#"){
136-
returnthis.setState({results});
145+
returnthis.setResults(results);
137146
}
138-
139-
this.setState({results:filter(results,query.slice(1))});
147+
results=filter(results,query.slice(1));
148+
returnthis.setResults(results);
140149
};
141150

142151
searchShortcuts=(query:string)=>{
143152
const results=formatShortcutResults();
144153
if(query=="?"){
145-
this.setState({results});
154+
this.setResults(results);
146155
}else{
147-
this.setState({results:filter(results,query.slice(1))});
156+
this.setResults(filter(results,query.slice(1)));
148157
}
149158
};
150159

151160
showTopSources=()=>{
152161
const{ tabs, sources}=this.props;
153162
if(tabs.length>0){
154163
consttabUrls=tabs.map((tab:Tab)=>tab.url);
155-
156-
this.setState({
157-
results:sources.filter(source=>tabUrls.includes(source.url))
158-
});
164+
this.setResults(sources.filter(source=>tabUrls.includes(source.url)));
159165
}else{
160-
this.setState({results:sources.slice(0,100)});
166+
this.setResults(sources);
161167
}
162168
};
163169

@@ -374,8 +380,7 @@ export class QuickOpenModal extends Component<Props, State> {
374380
if(!enabled){
375381
returnnull;
376382
}
377-
constnewResults=results&&results.slice(0,100);
378-
constitems=this.highlightMatching(query,newResults||[]);
383+
constitems=this.highlightMatching(query,results||[]);
379384
constexpanded=!!items&&items.length>0;
380385

381386
return(
@@ -398,7 +403,7 @@ export class QuickOpenModal extends Component<Props, State> {
398403
}
399404
{...(this.isSourceSearch() ?{size:"big"} :{})}
400405
/>
401-
{newResults&&(
406+
{results&&(
402407
<ResultList
403408
key="results"
404409
items={items}

‎src/components/test/QuickOpenModal.spec.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ describe("QuickOpenModal", () => {
209209
wrapper.find("input").simulate("change",{target:{value:"somefil"}});
210210
expect(filter).toHaveBeenCalledWith([],"somefil",{
211211
key:"value",
212-
maxResults:1000
212+
maxResults:100
213213
});
214214
});
215215

@@ -230,7 +230,7 @@ describe("QuickOpenModal", () => {
230230
.simulate("change",{target:{value:"somefil:33"}});
231231
expect(filter).toHaveBeenCalledWith([],"somefil",{
232232
key:"value",
233-
maxResults:1000
233+
maxResults:100
234234
});
235235
});
236236

@@ -257,7 +257,7 @@ describe("QuickOpenModal", () => {
257257

258258
expect(filter).toHaveBeenCalledWith([],"someFunc",{
259259
key:"value",
260-
maxResults:1000
260+
maxResults:100
261261
});
262262
});
263263

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp