Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(puppeteer): support to configure styles while rendering fragment segments #318

Merged
merged 1 commit into from
Aug 8, 2021
Merged

feat(puppeteer): support to configure styles while rendering fragment segments #318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/plugin-puppeteer/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import puppeteer, { Browser, ElementHandle, Page, Shooter, Viewport } from 'puppeteer-core'
import { Context, Logger, noop, segment } from 'koishi-core'
import { Context, Logger, noop, segment, hyphenate } from 'koishi-core'
import { escape } from 'querystring'
import { PNG } from 'pngjs'
import { resolve } from 'path'
Expand Down Expand Up @@ -64,6 +64,7 @@ export interface Config {
idleTimeout?: number
maxLength?: number
protocols?: string[]
bodyStyle?: Record<string, string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jsxContainerStyle 怎么样呢

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Container 也许不是很合适，不过只要在文档里写好叫什么都没问题（

}

enum Status { close, opening, open, closing }
Expand Down Expand Up @@ -135,6 +136,10 @@ export const defaultConfig: Config = {
height: 600,
deviceScaleFactor: 2,
},
bodyStyle: {
display: 'inline-block',
padding: '0.25rem 0.375rem',
shigma marked this conversation as resolved.
Show resolved Hide resolved
},
}

Context.delegate('puppeteer')
Expand Down Expand Up @@ -268,8 +273,12 @@ export function apply(ctx: Context, config: Config = {}) {
ctx.before('eval/send', (content) => {
return segment.transformAsync(content, {
async fragment({ content }) {
const style = Object
.entries(config.bodyStyle)
.map(([key, value]) => `${hyphenate(key)}: ${value};`)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

其实这里可以不要那个分号，然后下面用 join('; ') 看起来稍好一些

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我的习惯是最后加上分号，我会修改一下

.join('')
return await ctx.puppeteer.render(`<!doctype html>
<html><body style="display: inline-block; padding: 0.25rem 0.375rem">${content}</body></html>
<html><body style="${style}">${content}</body></html>
`, async (page, next) => next(await page.$('body')))
},
})
Expand Down