@xpadev-net/niconicomments 0.2.36 → 0.2.37

package/dist/bundle.d.ts

@@ -397,189 +397,189 @@ interface IComment {
   draw: (vpos: number, showCollision: boolean, isDebug: boolean) => void;
 }
 
-type inputFormatType =
-  | "niconicome"
-  | "formatted"
-  | "legacy"
-  | "legacyOwner"
-  | "owner"
-  | "v1"
-  | "empty"
-  | "default";
-type inputFormat =
-  | XMLDocument
-  | formattedComment[]
-  | formattedLegacyComment[]
-  | rawApiResponse[]
-  | ownerComment[]
-  | v1Thread[]
-  | string
-  | undefined;
-type modeType = "default" | "html5" | "flash";
-type Options = {
-  config: ConfigNullable;
-  debug: boolean;
-  enableLegacyPiP: boolean;
-  format: inputFormatType;
-  formatted: boolean;
-  keepCA: boolean;
-  mode: modeType;
-  scale: number;
-  showCollision: boolean;
-  showCommentCount: boolean;
-  showFPS: boolean;
-  useLegacy: boolean;
-  video: HTMLVideoElement | undefined;
-};
-type InitOptions = Partial<Options>;
+type inputFormatType =
+  | "niconicome"
+  | "formatted"
+  | "legacy"
+  | "legacyOwner"
+  | "owner"
+  | "v1"
+  | "empty"
+  | "default";
+type inputFormat =
+  | XMLDocument
+  | formattedComment[]
+  | formattedLegacyComment[]
+  | rawApiResponse[]
+  | ownerComment[]
+  | v1Thread[]
+  | string
+  | undefined;
+type modeType = "default" | "html5" | "flash";
+type Options = {
+  config: ConfigNullable;
+  debug: boolean;
+  enableLegacyPiP: boolean;
+  format: inputFormatType;
+  formatted: boolean;
+  keepCA: boolean;
+  mode: modeType;
+  scale: number;
+  showCollision: boolean;
+  showCommentCount: boolean;
+  showFPS: boolean;
+  useLegacy: boolean;
+  video: HTMLVideoElement | undefined;
+};
+type InitOptions = Partial<Options>;
 
-type formattedCommentWithFont = {
-  id: number;
-  vpos: number;
-  date: number;
-  date_usec: number;
-  owner: boolean;
-  premium: boolean;
-  mail: string[];
-  user_id: number;
-  layer: number;
-  loc: commentLoc;
-  size: commentSize;
-  fontSize: number;
-  font: commentFont;
-  color: string;
-  full: boolean;
-  ender: boolean;
-  _live: boolean;
-  long: number;
-  invisible: boolean;
-  content: commentContentItem[];
-  flash: boolean;
-  lineCount: number;
-  lineOffset: number;
-};
-type formattedCommentWithSize = formattedCommentWithFont & {
-  height: number;
-  width: number;
-  lineHeight: number;
-  resized: boolean;
-  resizedX: boolean;
-  resizedY: boolean;
-  content: commentMeasuredContentItem[];
-  charSize: number;
-};
-type parsedComment = formattedCommentWithSize & {
-  posY: number;
-  image?: HTMLCanvasElement | boolean;
-};
-type commentContentItem = {
-  content: string;
-  font?: commentFlashFont;
-  width?: number[];
-};
-type commentMeasuredContentItem = commentContentItem & {
-  width: number[];
-};
-type commentContentIndex = {
-  index: number;
-  font: "gothic" | "gulim" | "simsunStrong" | "simsunWeak";
-};
-type commentFont = "defont" | "mincho" | "gothic" | "gulim" | "simsun";
-type commentFlashFont = "defont" | "gulim" | "simsun";
-type commentSize = "big" | "medium" | "small";
-type commentLoc = "ue" | "naka" | "shita";
-type collision = { [key in collisionPos]: collisionItem };
-type collisionPos = "ue" | "shita" | "right" | "left";
-type collisionItem = { [p: number]: IComment[] };
-type nicoScript = {
-  reverse: nicoScriptReverse[];
-  ban: nicoScriptBan[];
-  default: nicoScriptDefault[];
-  replace: nicoScriptReplace[];
-};
-type nicoScriptReverse = {
-  target: nicoScriptReverseTarget;
-  start: number;
-  end: number;
-};
-type nicoScriptReverseTarget = "コメ" | "投コメ" | "全";
-type nicoScriptReplace = {
-  start: number;
-  long: number | undefined;
-  keyword: string;
-  replace: string;
-  range: nicoScriptReplaceRange;
-  target: nicoScriptReplaceTarget;
-  condition: nicoScriptReplaceCondition;
-  color: string | undefined;
-  size: commentSize | undefined;
-  font: commentFont | undefined;
-  loc: commentLoc | undefined;
-  no: number;
-};
-type nicoScriptReplaceRange = "単" | "全";
-type nicoScriptReplaceTarget = "コメ" | "投コメ" | "全" | "含まない" | "含む";
-type nicoScriptReplaceCondition = "完全一致" | "部分一致";
-type nicoScriptBan = {
-  start: number;
-  end: number;
-};
-type nicoScriptDefault = {
-  start: number;
-  long: number | undefined;
-  color: string | undefined;
-  size: commentSize | undefined;
-  font: commentFont | undefined;
-  loc: commentLoc | undefined;
-};
-type measureTextResult = {
-  width: number;
-  height: number;
-  resized: boolean;
-  resizedX: boolean;
-  resizedY: boolean;
-  fontSize: number;
-  lineHeight: number;
-  content: commentMeasuredContentItem[];
-  charSize: number;
-};
-type parsedCommand = {
-  loc: commentLoc | undefined;
-  size: commentSize | undefined;
-  fontSize: number | undefined;
-  color: string | undefined;
-  font: commentFont | undefined;
-  full: boolean;
-  ender: boolean;
-  _live: boolean;
-  invisible: boolean;
-  long: number | undefined;
-};
-
-type measureTextInput = {
-  content: commentContentItem[];
-  resized?: boolean;
-  ender: boolean;
-  size: commentSize;
-  fontSize: number;
-  resizedY?: boolean;
-  resizedX?: boolean;
-  font: commentFont;
-  loc: commentLoc;
-  full: boolean;
-  flash: boolean;
-  lineCount: number;
-  lineHeight?: number;
-  charSize?: number;
-};
-
-type measureInput = {
-  font: commentFont;
-  content: commentContentItem[];
-  lineHeight: number;
-  charSize: number;
-  lineCount: number;
-};
+type formattedCommentWithFont = {
+  id: number;
+  vpos: number;
+  date: number;
+  date_usec: number;
+  owner: boolean;
+  premium: boolean;
+  mail: string[];
+  user_id: number;
+  layer: number;
+  loc: commentLoc;
+  size: commentSize;
+  fontSize: number;
+  font: commentFont;
+  color: string;
+  full: boolean;
+  ender: boolean;
+  _live: boolean;
+  long: number;
+  invisible: boolean;
+  content: commentContentItem[];
+  flash: boolean;
+  lineCount: number;
+  lineOffset: number;
+};
+type formattedCommentWithSize = formattedCommentWithFont & {
+  height: number;
+  width: number;
+  lineHeight: number;
+  resized: boolean;
+  resizedX: boolean;
+  resizedY: boolean;
+  content: commentMeasuredContentItem[];
+  charSize: number;
+};
+type parsedComment = formattedCommentWithSize & {
+  posY: number;
+  image?: HTMLCanvasElement | boolean;
+};
+type commentContentItem = {
+  content: string;
+  font?: commentFlashFont;
+  width?: number[];
+};
+type commentMeasuredContentItem = commentContentItem & {
+  width: number[];
+};
+type commentContentIndex = {
+  index: number;
+  font: "gothic" | "gulim" | "simsunStrong" | "simsunWeak";
+};
+type commentFont = "defont" | "mincho" | "gothic" | "gulim" | "simsun";
+type commentFlashFont = "defont" | "gulim" | "simsun";
+type commentSize = "big" | "medium" | "small";
+type commentLoc = "ue" | "naka" | "shita";
+type collision = { [key in collisionPos]: collisionItem };
+type collisionPos = "ue" | "shita" | "right" | "left";
+type collisionItem = { [p: number]: IComment[] };
+type nicoScript = {
+  reverse: nicoScriptReverse[];
+  ban: nicoScriptBan[];
+  default: nicoScriptDefault[];
+  replace: nicoScriptReplace[];
+};
+type nicoScriptReverse = {
+  target: nicoScriptReverseTarget;
+  start: number;
+  end: number;
+};
+type nicoScriptReverseTarget = "コメ" | "投コメ" | "全";
+type nicoScriptReplace = {
+  start: number;
+  long: number | undefined;
+  keyword: string;
+  replace: string;
+  range: nicoScriptReplaceRange;
+  target: nicoScriptReplaceTarget;
+  condition: nicoScriptReplaceCondition;
+  color: string | undefined;
+  size: commentSize | undefined;
+  font: commentFont | undefined;
+  loc: commentLoc | undefined;
+  no: number;
+};
+type nicoScriptReplaceRange = "単" | "全";
+type nicoScriptReplaceTarget = "コメ" | "投コメ" | "全" | "含まない" | "含む";
+type nicoScriptReplaceCondition = "完全一致" | "部分一致";
+type nicoScriptBan = {
+  start: number;
+  end: number;
+};
+type nicoScriptDefault = {
+  start: number;
+  long: number | undefined;
+  color: string | undefined;
+  size: commentSize | undefined;
+  font: commentFont | undefined;
+  loc: commentLoc | undefined;
+};
+type measureTextResult = {
+  width: number;
+  height: number;
+  resized: boolean;
+  resizedX: boolean;
+  resizedY: boolean;
+  fontSize: number;
+  lineHeight: number;
+  content: commentMeasuredContentItem[];
+  charSize: number;
+};
+type parsedCommand = {
+  loc: commentLoc | undefined;
+  size: commentSize | undefined;
+  fontSize: number | undefined;
+  color: string | undefined;
+  font: commentFont | undefined;
+  full: boolean;
+  ender: boolean;
+  _live: boolean;
+  invisible: boolean;
+  long: number | undefined;
+};
+
+type measureTextInput = {
+  content: commentContentItem[];
+  resized?: boolean;
+  ender: boolean;
+  size: commentSize;
+  fontSize: number;
+  resizedY?: boolean;
+  resizedX?: boolean;
+  font: commentFont;
+  loc: commentLoc;
+  full: boolean;
+  flash: boolean;
+  lineCount: number;
+  lineHeight?: number;
+  charSize?: number;
+};
+
+type measureInput = {
+  font: commentFont;
+  content: commentContentItem[];
+  lineHeight: number;
+  charSize: number;
+  lineCount: number;
+};
 
 declare const convert2formattedComment: (data: unknown, type: inputFormatType) => formattedComment[];
 

package/dist/bundle.js

@@ -1,5 +1,5 @@
 /*!
-  niconicomments.js v0.2.36
+  niconicomments.js v0.2.37
   (c) 2021 xpadev-net https://xpadev.net
   Released under the MIT License.
 */
@@ -1577,6 +1577,9 @@
                 item.width = itemWidth[i];
             }
             comment.fontSize = (comment.charSize || 0) * 0.8;
+            var charScale = getFontSizeAndScale(comment.charSize || 0);
+            if (charScale.scale < 1)
+                height *= 1.01;
             return {
                 width: width * scale,
                 height: height * scale,
@@ -1674,6 +1677,7 @@
                 this.context.strokeRect(posX, posY, this.comment.width, this.comment.height);
                 for (var i = 0; i < this.comment.lineCount; i++) {
                     var linePosY = (this.comment.lineHeight * (i + 1) +
+                        (this.comment.charSize - this.comment.lineHeight) / 2 +
                         this.comment.lineHeight * -0.16 +
                         (((_a = config.fonts[this.comment.font]) === null || _a === void 0 ? void 0 : _a.offset) ||
                             0)) *
@@ -1747,6 +1751,7 @@
                     if (line === undefined)
                         continue;
                     var posY = (this.comment.lineHeight * (lineCount + 1 + paddingTop) +
+                        (this.comment.charSize - this.comment.lineHeight) / 2 +
                         this.comment.lineHeight * -0.16 +
                         (((_a = config.fonts[this.comment.font]) === null || _a === void 0 ? void 0 : _a.offset) ||
                             0)) /

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xpadev-net/niconicomments",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "NiconiComments is a comment drawing library that is somewhat compatible with the official Nico Nico Douga player.",
   "main": "dist/bundle.js",
   "types": "dist/bundle.d.ts",