Skip to content

Commit

Permalink
fix: wrong reply size
Browse files Browse the repository at this point in the history
Signed-off-by: Ryan Wang <i@ryanc.cc>
  • Loading branch information
ruibaby committed Apr 28, 2024
1 parent f04fb71 commit 31a1312
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ build {
}

halo {
version = "2.14.0"
version = "2.15.0-rc.1"
}
16 changes: 14 additions & 2 deletions packages/comment-widget/src/comment-replies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import { css, html, LitElement } from 'lit';
import { property, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
import { consume } from '@lit/context';
import { baseUrlContext, replySizeContext, toastContext, withRepliesContext } from './context';
import {
baseUrlContext,
replySizeContext,
toastContext,
withRepliesContext,
withReplySizeContext,
} from './context';
import './reply-item';
import './loading-block';
import './reply-form';
Expand All @@ -20,6 +26,10 @@ export class CommentReplies extends LitElement {
@state()
withReplies = false;

@consume({ context: withReplySizeContext, subscribe: true })
@state()
withReplySize = 10;

@consume({ context: replySizeContext, subscribe: true })
@state()
replySize = 10;
Expand Down Expand Up @@ -92,7 +102,9 @@ export class CommentReplies extends LitElement {
this.page = 1;
}

const queryParams = [`page=${this.page || 0}`, `size=${this.replySize}`];
const size = this.withReplies ? this.withReplySize : this.replySize;

const queryParams = [`page=${this.page || 0}`, `size=${size}`];

const response = await fetch(
`${this.baseUrl}/apis/api.halo.run/v1alpha1/comments/${this.comment?.metadata.name}/reply?${queryParams.join('&')}`
Expand Down
16 changes: 9 additions & 7 deletions packages/comment-widget/src/comment-widget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ import { repeat } from 'lit/directives/repeat.js';
import baseStyles from './styles/base';
import { provide } from '@lit/context';
import {
allowAnonymousCommentsContext,
avatarPolicyContext,
avatarProviderContext,
avatarProviderMirrorContext,
baseUrlContext,
currentUserContext,
emojiDataUrlContext,
Expand All @@ -13,24 +17,21 @@ import {
nameContext,
replySizeContext,
toastContext,
useAvatarProviderContext,
versionContext,
withRepliesContext,
allowAnonymousCommentsContext,
useAvatarProviderContext,
avatarPolicyContext,
avatarProviderContext,
avatarProviderMirrorContext,
withReplySizeContext,
} from './context';
import './comment-form';
import './comment-item';
import './comment-pagination';
import varStyles from './styles/var';
import { ToastManager } from './lit-toast';
import {
AnonymousUserPolicy,
AllUserPolicy,
NoAvatarUserPolicy,
AnonymousUserPolicy,
AvatarPolicyEnum,
NoAvatarUserPolicy,
setPolicyInstance,
} from './avatar/avatar-policy';
import { setAvatarProvider } from './avatar/providers';
Expand Down Expand Up @@ -67,6 +68,7 @@ export class CommentWidget extends LitElement {
@property({ type: Boolean, attribute: 'with-replies' })
withReplies = false;

@provide({ context: withReplySizeContext })
@property({ type: Number, attribute: 'with-reply-size' })
withReplySize = 10;

Expand Down
1 change: 1 addition & 0 deletions packages/comment-widget/src/context/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const nameContext = createContext<string>(Symbol('name'));
export const versionContext = createContext<string>(Symbol('version'));
export const replySizeContext = createContext<number>(Symbol('replySize'));
export const withRepliesContext = createContext<boolean>(Symbol('withReplies'));
export const withReplySizeContext = createContext<number>(Symbol('withReplySize'));
export const useAvatarProviderContext = createContext<boolean>(Symbol('useAvatarProvider'));
export const avatarProviderContext = createContext<string>(Symbol('avatarProvider'));
export const avatarProviderMirrorContext = createContext<string>(Symbol('avatarProviderMirror'));
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/extensions/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ spec:
key: withReplySize
validation: required
value: 5
help: 如果开启了同时加载评论的回复,此选项将覆盖默认加载回复条数的选项
- group: avatar
label: 头像设置
formSchema:
Expand Down

0 comments on commit 31a1312

Please sign in to comment.