@xcpcio/core 0.35.0 → 0.35.1

package/dist/index.cjs

@@ -15,8 +15,8 @@ const relativeTime = require('dayjs/plugin/relativeTime');
 const _ = require('lodash');
 const XLSX = require('xlsx-js-style');
 const stringWidth = require('string-width');
-const colorDiff = require('color-diff');
 const chroma = require('chroma-js');
+const colorDiff = require('color-diff');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -469,7 +469,7 @@ function calcDirt(attemptedNum, solvedNum) {
   return Math.floor((attemptedNum - solvedNum) * 100 / attemptedNum);
 }
 
-function getWhiteOrBlackColor(background) {
+function getWhiteOrBlackColorV1(background) {
   const [R, G, B] = chroma__default(background).rgb();
   const color = { R, G, B };
   const palette = [
@@ -483,6 +483,12 @@ function getWhiteOrBlackColor(background) {
     return "#fff";
   }
 }
+function getWhiteOrBlackColor(background) {
+  const [R, G, B] = chroma__default(background).rgb();
+  const brightness = (R * 299 + G * 587 + B * 114) / 1e3;
+  const threshold = 148;
+  return brightness <= threshold ? "#fff" : "#000";
+}
 
 class ProblemStatistics {
   constructor() {
@@ -1717,6 +1723,7 @@ exports.getImageSource = getImageSource;
 exports.getTimeDiff = getTimeDiff;
 exports.getTimestamp = getTimestamp;
 exports.getWhiteOrBlackColor = getWhiteOrBlackColor;
+exports.getWhiteOrBlackColorV1 = getWhiteOrBlackColorV1;
 exports.isAccepted = isAccepted;
 exports.isNotCalculatedPenaltyStatus = isNotCalculatedPenaltyStatus;
 exports.isPending = isPending;

package/dist/index.d.ts

@@ -83,6 +83,7 @@ declare class TeamProblemStatistics {
 
 declare function calcDirt(attemptedNum: number, solvedNum: number): number;
 
+declare function getWhiteOrBlackColorV1(background: string): "#000" | "#fff";
 declare function getWhiteOrBlackColor(background: string): "#000" | "#fff";
 
 declare function createDayJS(time?: Date | string | number | undefined): dayjs.Dayjs;
@@ -327,4 +328,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Awards, Balloon, Balloons, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Awards, Balloon, Balloons, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/dist/index.mjs

@@ -12,8 +12,8 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import _ from 'lodash';
 import * as XLSX from 'xlsx-js-style';
 import stringWidth from 'string-width';
-import { furthest } from 'color-diff';
 import chroma from 'chroma-js';
+import { furthest } from 'color-diff';
 
 function stringToSubmissionStatus(status) {
   status = status.toUpperCase().replace(" ", "_");
@@ -438,7 +438,7 @@ function calcDirt(attemptedNum, solvedNum) {
   return Math.floor((attemptedNum - solvedNum) * 100 / attemptedNum);
 }
 
-function getWhiteOrBlackColor(background) {
+function getWhiteOrBlackColorV1(background) {
   const [R, G, B] = chroma(background).rgb();
   const color = { R, G, B };
   const palette = [
@@ -452,6 +452,12 @@ function getWhiteOrBlackColor(background) {
     return "#fff";
   }
 }
+function getWhiteOrBlackColor(background) {
+  const [R, G, B] = chroma(background).rgb();
+  const brightness = (R * 299 + G * 587 + B * 114) / 1e3;
+  const threshold = 148;
+  return brightness <= threshold ? "#fff" : "#000";
+}
 
 class ProblemStatistics {
   constructor() {
@@ -1650,4 +1656,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Award, Balloon, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Balloon, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "lodash": "^4.17.21",
     "string-width": "^6.1.0",
     "xlsx-js-style": "^1.2.0",
-    "@xcpcio/types": "0.35.0"
+    "@xcpcio/types": "0.35.1"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/utils/color.ts

@@ -1,7 +1,7 @@
-import { furthest } from "color-diff";
 import chroma from "chroma-js";
+import { furthest } from "color-diff";
 
-export function getWhiteOrBlackColor(background: string) {
+export function getWhiteOrBlackColorV1(background: string) {
   const [R, G, B] = chroma(background).rgb();
   const color = { R, G, B };
   const palette = [
@@ -17,3 +17,12 @@ export function getWhiteOrBlackColor(background: string) {
     return "#fff";
   }
 }
+
+export function getWhiteOrBlackColor(background: string) {
+  const [R, G, B] = chroma(background).rgb();
+
+  const brightness = (R * 299 + G * 587 + B * 114) / 1000;
+  const threshold = 148;
+
+  return brightness <= threshold ? "#fff" : "#000";
+}